[snicker] That's exactly the technique I use on the 17.

Upwind technique on the 17 is to honk it in tight (using both hands and your legs to get it in that last bit), then steer through the waves / gusts. After nearly loosing the tiller off the back of the wing (=instant capsize when the boat heads up while you're still trapping off the wing), I started holding the tiller in between my toes when getting that last bit in.
[Linked Image]

The only problem is that you have to sail barefoot. I've got a bunch of nicks on my feet from doing that for seven days straight in Rehoboth.