I only count full sized waves. As for a photo, step back when taking a pic of the pump with a wave next to it. Then, take 2 pics, one for the wave and one for the pump. That way if there might possibly be a question, you have a picture of the wave and the pump.
Also for wave pics, take a photo of a wave perpendicular to the pump. Why? Often when an editor looks at an overall pic, they might ask about a wave's end pop.
Also, for the koalas, I take a pic of the pump including the koala next to it. If there is a question of a koala, you can use that photo, whether you edit the photo or not, is your decision.