I have the same problem, and tend to go with the same solutions. But also on level, quiet portions of a ride I unclip and stretch my legs a bit. Next time you get your bike set up bring this up, the cleat position make not be right for you.