One design Tornado for men, F18 for women.
(or F18 for men, F16 for women)

Done and done

Next iteration, replace the F18 with a carbon F20 like the new nacra

(only real issue is does the F18 fleet want this? right low, lots of boat builders, lots of club sailing all the way to pro, olympics might kill that)

The the dev path for juniors is easy, start in Opti, instead of going Laser Radial or 420, go:
F16 (maybe club sails, smaller sail plan, see Viper Club for example)
F16 full sails
F18
Olympics