There are a few guys around that would be perfectly OK and tune your car professionally. I think John at TT might be limited with the ECUs he deals with, i.e. Autronic only, might be wrong though.
I agree with Clint32 that you can't expect a tuner to give a garantee.
Jase, since yours is a 32, keeping the stock ECU and do a retune is an option, then your choice is limited re tuners, I think Martin @ Morpowa is the only guy in town that an do it...again correct me if I'm wrong there.
If you want to go aftermarket ECU, and therefore best for later engine upgrades, due to the 6 x throttle issue, MAP sensor ECUs have trouble with light load stuff, so keeping the MAFs is best, so Power FC or Motec is all that can be used with MAFs. Plenty of guys can tune with them, Martin (Morpowa), Shaun (RPM), Mildren, Tilbrooks (maybe not Motec), D1 Garage.