how much sail area do you have now? my hobie 16 has a reefable main and option of a roller furling jib at 218 sf, a hobie 18 rig with reef points might be even better, you also get a rotating mast that helps efficiency. those wharram rigs are very cruiser oriented, are you sailing to tahiti or do you want to throw some spray across the bay?