Get the Rollei repaired a Rollei with a recent CLA shouldn't need a repair any time soon and if you think that the rollei's maintenance costs are high you've never payed for a Hasselblad repair. On another note if you want a Medium Format Rangefinder take a look at the Fuji Fixed lens RF they're great cameras and can be had for less than $ 500 at least on KEH.com. The 690 series uses an even bigger Filmformat than the Mamiya and 6x9 has the same aspect ratio as 35mm but better tonality.

Good Luck with your search.

Dominik