Hardware looks excellent to me. Your curved traveller can be a pain when sailing, but otherwise, just add the spi gear, new hulls and go with what you have.
Mainsail might be something to ponder, and the same for re-rigging the mast.