If your thinking of adding a spinnaker then my recommendation is not spend you money on converting the NA rig, rather put that into your spinnaker rig. As Lee mentioned, get with an F18 spinnaker, that is what I did on mine and it rocked - not too overpowered and easily managed. Also, by not doing the NA rig your spin pole will sit higher and will not be a problem in rough water.

That said, Performace has all the parts you'll need for the spin conversion.

As for your sail - EP sails is the way to go for your jib and main, and Whirlwind for you spinnaker.

Here is a pic of the set up I had & where are you located