I had two 16's over the years but now sail a 20. In most conditions beating to weather I two blocked both the main and the jib and set the direction off the jib telltales. I S coursed by moving the windward telltale to 45 degrees and back to horizontal.

The only time I'd ever bear off going to weather was in light air. I'd also slack off both sails a couple of inches so they'd stay full.

Again, JMHO.