Sail it as is. Get a new aftermarket 5.8 sail when you want, but the rest is time and money that could go towards a boat that is already set up the way you want IMO.

It is a hull flying beast as it is.