My personal opinion is that this World Cup series has been a failure. So many of the top guys and gals are missing.
I hope that World Sailing will discontinue the event or 'invent' something more interesting.
Have to agree with tag. Removing a bit of water after an outing is OK. But I would weigh the hull to see if it has absorbed a lot of water in its past life.
And do find out where the water is coming from!
Back to sailing fundamentals:
1. Especially on a Sunfish, don't sheet in too much going upwind. On starboard tack one can sheet in a bit more; having the clew above the corner of the stern is about right.
2. Learn to roll tack
3. Use a vane on the upper spar (gaff). Can be as simple as a clothes...