those things are sort of a PITA.
i wouldn't think there is anything wrong with your upper unit.
probably something in the 22 rf conversion that needs some work.
i would check the rails to see if their bent before i did any polish work.
lots of bad parts floating around with improper or no heat-treat these days.