I think that to be the wisest decision as well.

Besides you got more then enough on your plate with the spinnaker, new mainsail and selftacker. The last is almost a must when spi sailing. You'll need the space on the trampoline and the jib sheets coming so far back really interferes with the spi halyard (retrieval line) and the spi sheets.

Best of luck and enjoyment !

Wouter