Glad you got good service Huss.
Picked up a Hasselblad 500CM in 2009 that had seen some better days. Hasselblad did this service option back then for the old 500 cameras (I think they were getting folks ready for their digital backs) and they took the camera, two backs, an an 80mm & 150mm lens and refurbished the whole batch for less than a grand. And everything came back like new. Was blown away.
The 45º viewfinder was not included in the service.
If I still shot medium format, Hasselblad is who I'd go with.