I forsee a proposal that includes an outdated F18 with a carbon mast, reduced sails and a agreement to supply charter boats for the Games
Sad, but true.
Since dreaming is free and given the ISAF specs, a new 15 ft cat with a two part wing would be my personal favorite.
Why small? Because a small wing is a lot less trouble to build, handle and store, the boat would be cheaper, novices would be able to sail it and the fun is guaranteed for kids/teens, so it would have the potential to atract new sailors at their youth.
A modified Tornado or F18 will be too big/heavy for the weight range and are unlikely to atract young sailors.
The F16 is close to ideal, but with the addition of a wing, 16 ft may be too big for the specified weight range.