Steven, sorry to hear you're unhappy with your Summarit-M 50 mm. However due to the nature and the touchiness of the rangefinder coupling between camera and lens, you can have bad luck with the focus adjustment with any lens, in particular when purchased from second-hand. For example, I got a used Summicron-M 90 mm lens just recently, and the seller told me he had this lens adjusted to his M camera only a few months before. On my camera however it was totally off so it was unusable. It's off to Leica Customer Service right now.
Regarding focus shift—all lenses that have an aperture also have some focus shift. Some more, some less; depends on the lens design. It cannot be fixed. Fast lenses typically suffer more from it than lenses with moderate speeds, and wide-angles more than telephoto lenses. The Leica Summarit-M 50 mm 1:2.5 lens also has some focus shift (as has any lens) but it's so small it's hard to detect and absolutely no issue in real life (as with most lenses).
Generally, the Leica Summarit-M line of lenses is often under-appreciated. They're damn fine lenses at (for Leica) good prices. In particular the Summarit-M 35 mm is a real gem which I prefer over the Summicron-M 35 mm Asph. Also the Summarit-M 50 mm is really good; it's just on par with the Summicron-M 50 mm, at about 1/2 f-stop less speed and at a much nicer price and in a really small package (almost pancake-like). Got mine from eBay for only 650.00. The 50 mm Summarit's particular strength is the incredibly smooth and natural rendition of things just slightly out of focus. In this regard it is better than the Summilux-M 50 mm Asph, so I prefer the Summarit whenever 'lux speed is not required (and it seldom is).