Sounds like the right decision to me.

Please get back to use when you rig it for F16 sailing with spi and selftacker (if you are sailing two-up). Would be very interesting to hear what your experiences are after some time on the boat racing with full width F16s.