Well, I am late getting in. I would be inclined to agree with seeing what a CLA would cost first, simply due to the sentimental value. If not, the just about any of the previous suggestions would be good. I personally have the Yashica TL X, Pentax SV, Fujica ST 801 and Fujica St 901. I have also used M-42 lenses on a Yashica FX 103, Contax 130Q, and soon will on my newly acquired Contax 167mt. All are viable solutions for the reasons stated above.
My recommendation would be the ST 801 if you can find one in good shape and reasonably priced, and better yet, the ST 901 (but harder to find). It's meter is more sensitive (EV -3 to EV 18). Actually, the Fujica AX-3 has adapters for M-42. But I would stay with the 801 or 901. Fujica made earlier models, the 601 and 701. But they are getting really long in the tooth, more so than the 801 or 901.
A good working Yashica TL Electro X is certainly a good camera, but larger.