So you fiddled with both the rangefinder and the lens? That's obviously not ideal, as long as you're not certain which one is out, because a) it makes things harder and b) you could end up with a body and lens that only focus correctly with each other. I hope you didn't (have to) change the gain of the rangefinder (the relationship between close and infinity focus). If you only had to adjust infinity, no big deal. I see two ways to go about this:
a) get actual infinity focus correct, regardless of the RF. I.e. shim the lens if needed. I've never found a ground glass and loupe to be quite accurate enough for that, closer distances are much easier, so you will need to shoot a test roll and scan/enlarge. Then you can adjust the RF at infinity.
b) adjust the RF at a close distance to match the focus in ground glass, this works a lot better than infinity because you can see the target coming into focus and going out of focus on the ground glass. Then focus the lens to infinity. If the RF is now also at infinity, you are good. If not, infinity focus of the lens needs to be adjusted. This way is preferably to me, because it works without repeated test shots ( I'd still take some to be sure).
Bot of these methods only work if RF gain is correct from the outset.