If you're concerned about the taking lens marks and still in the return window, I'd probably send it back too if it bothers you now. Unless you got the camera at enough of a discount initially to have it serviced and potentially the taking lens replaced while still being under what a clean, CLA'd Rollie would cost you. Long shot.
I'm a huge TLR fan but if you want to shoot other focal lengths, I'd jump to a medium format SLR. The Mamiyas are nice but at least to me, they loose the size advantage which is part of what makes a TLR so nice. The MF SLR recommendations are pretty good. I've only used a Bronica SQ-A - and generally only use it when using a wider angle lens - and it is a loud camera, but it and the Mamiya 645 systems are pretty good deals.