Adding larger wings may work best ,this was the approach taken by several earlier 1000 mile race entries .

If the basic math is taken into account a 400 lb crew moved out 2 ft provides an added 800 ft Lbs of righting moment to help hold the boat down as wind increases .

Move them out 10 ft and the ft Lbs becomes 4,000 --wow .

The I-20 has wide flat large volume forward sections so it can handle some of the added forces from a 10 ft wing without pitchpoling ---right away . <img src="http://www.catsailor.com/forums/images/graemlins/cool.gif" alt="" />

The other corespondng modification might be smaller forward placed hydrafoils

http://www.foils.org/sailfoil.htm

and these could aslo act to balance the spin set on a longer spin pole --say 15 ft .

this increases spin luff angle and also creates added lift .

Check out Aussie 18 skiffs for examples of spin luff angle and lift .

http://jameswebb.ca/gallery/Aussie18Crashes

It would also be a good idea to lengthen the forstay a little and rake the mast back more .

There is a speed trials on San Fran Bay in June ,--this would be a great craft to enter .