>Take  the 20ft windward hull from Expeditionarry and make it the leeward hull."

problem with this is, the WW and LW hulls have different Beam/Length ratios, the L/W hull being not only longer but considerably finer which goes a long way to account for the speed.

but of course this is simply academic, as both need to be built