Can someone recommend a place to get an OM-1 CLA'd in the UK? Nothing wrong with mine but I'd like to keep it that way!

Also, I'm looking at buying a macro. In the past I had a Tamron 90/2.8 AF for my EOS system which I really liked. That was long gone but I'm now thinking either to get another one of those or perhaps look for a macro for my OM-1, as I could also use it with an adaptor on EOS. The OM 90/2 caught my attention but it costs more than a new Tamron 90 AF. Does anyone have experience with both?? I am more interested in close-up portraits, not so much actual macro performance, so say something in the 1:15-1:4 range. The other option is the old adaptall Tamron 90/2.5 which costs very little and if it is anything like the AF one I'd be quite happy. Any suggestions between these 3 lenses (Tamron 90/2.8 AF, 90/2.5 adaptall and 90/2) will be greatly appreciated!