Have you considered a Nacra 17R? Comes with an optional jib kit. Hulls are more bouyant; hold more people more comfortably. I was in the same position you are in now and narrowed down my search to the 17R and FX-1. I felt I got more bang for the buck with the 17R. You can get a color choice for the hulls and sails, black or standard silver anodized beams, and the standard superior new rudder blades. Also an easy to raise/lower white carbon mast. All built in the USA. I'm very happy with mine!!
Bob