Nick, I hope you still get some time on the water.
I use my six foot paddle quite a bit when poling. I don't do the windmill technique either. My poles are wood with a shoe on one end only, so that's the only end I get wet. If I come to a short deep stretch I may stick with the pole, using it...