Keith
Check out www.hurricane59.com and see how they have upgraded the 5.9 There is now a Hurricane 5.9 SX three sail model.
By fitting a smaller jub they have kept the same SCHRS handicap number, even with three sails. Might be the upgrade you are looking for !