I'm not sure about the M7 lenses, but all the lenses on my M6's focus on infinity when turned all the way to infinity.

I'm wondering if it's not something with your eyesight. Have you held your eye up to the camera at different viewing angles to see if that helps? I know that sometimes if I'm not looking into the viewfinder at exactly the right angle I cannot focus correctly. If you had the camera adjusted that many times it's hard to believe that it's not fixed. Sometimes the patches aren't in perfect alignment, meaning sometimes one patch appears to be slightly above the other. My Bronica RF645 is like that and it still aligns vertically perfectly. I think this is common.