Props for going out. Some good riding in there. But, it’s got to be frustrating to have to empty out after almost every ride. If it were me, I would install an electric pump or revert to a C1 (like old PNetter, TommyC1, who surfed a couple of times with the NE surf kayakers group).
It seems like you need to put a stroke in on top of the wave to keep it from throwing you back to the beach. You are putting up an air brace going over the wave top.