Sounds like exactly the kind of May sailing day we had last year here in Boston harbor. Except in our case, the roller furler jammed, and there was no way to furl the foresail, while the wind was howling in the rigging, the jib flapping, and the aux motor (outboard) barely able to keep the boat headed into the wind. Finally had to crawl forward and pull the jib down out of the furler track (losing the internal halyard up the mast in the process).
Very scary start to the season, and lesson learned that it's not possible to be too careful about these No Wind - Gusty wind days.
Sounds to me, that your sail plan management is a prudent approach.