If you want a stiff plattform, go for the uni rigged with twin forstays. That rigg stiffens up the platform and is more efficient on an upwind/downwind course. I don't think the way to a faster boat is do add more sails, lines and other stuff. Keep the boat clean (meaning low wind resistance) and light.

If you compare the Tornado and a M20 on an upwind/downwind course the M20 will beat the Tornado on each upwind due to a more efficient rig and a cleaner and lighter boat. On the downwind it should be a bit faster but NOT on the reach.

/håkan