For the money you are looking to invest in your 5.8, you could also do this:

http://www.thebeachcats.com/classifieds/catamarans-for-sale/p12903-2003-hobie-tiger-f18.html

With the Tiger, you'll have a proven platform that works together, plus a spinnaker, and a class to race in (if you desire to that).