When using a headsail like a Hooter or Spin, you are just fine with normal mast rotation. That is because your main is sailing almost close hauled or on a close reach, so your settings for upwind will be pretty close off the wind.

The reason for major mast rotation is when you have only a main or just a main and jib.

In other words, with the H17 and 17, don't sweat it.
Rick