i would suggest john aswell...

i'd also talk to mastro about getting some mor dyno time.. tune on the street with john.. then do the fine tuning on the dyno with john at mastro.