I'd be happy to stick with either of those two you have already mentioned. Best to have the named man tuning your car, the're old school mechanics who know their stuff.