Boatslut,
I'm sure somebody else more authoritative will answer you about this, but I think you are wrong. Starboard has right of way, regardless of windward-leeward positions. I am told that the applicable rule is: Section A, Rule 10: When on opposite tacks, the port tack boat shall keep clear of a starboard tack boat.

And when boats meet going upwind and downwind, the port/starboard rule still prevails. If the boats are on the SAME tack, the leeward boat has right of way.

Wow, I can't believe I am trying to answer a rules question.

But this just makes me feel even more strongly that we have to make rules simpler to understand. I've been racing for 40 years, and I still don't understand anything beyond the basics of starboard has right of way on opposite tacks and leeward boat has right of way on same tacks. And as far as powerboats, I know that the boat approaching me from the right has right of way.

It's so much easier on land with roads and signs and traffic lights.