I have several Russian cameras, and I really like Russian optics, but I wouldn't want a Russian camera as my only camera. The reliability is just not there. All of mine have had little issues crop up from time to time that I've been able to fix myself, but it was nice to have other cameras to shoot while doing so.
It sounds like you're very happy with your Yashicamat so it seems there is no reason to change. If money is tight, why not look for a Yashica C or D TLR to load with a second type of film. Most or all of the accessories you already own should fit it, and they can be found for under $100.