Yep, as soon as the guy gybes to port he is overlapped with the stb guy no matter where he is on the course. The right of way only comes into play at (or approaching) the 2 length zone.

The Stb boat must give room at the mark for the port boat, that where it gets tricky (how much room to give??)