Mary, I think the rules you quoted are pretty clear. You do not have to have any sails to be F16 compliant. OTOH, if you're hoping to be competitive, then you would want to have all the sails, including a spinnaker.

If your objective was to sail F16, then I'm sure you did the right thing.

Mark.