RotorFloater

I just had my 93 R1 engine rebuilt by Jeff @ Rotary Power. He put 3mm seals in, new vaccum lines, new check valves,new wiring harness and some new solenoids. The whole thing is perfect mechanically, I sent the Apexi ECU to SR motorsports to have them remap it and installed it. I just replaced the O2 sensor too. I have a 3" downpipe,stock cat,Apexi dual catback, Pettit intake.The car runs smooth at idle and smooth under load on the freeway, but at cruising through town @ 2000-2200 rpm the dang thing surges BAD! Some say it could be the TPS going bad others say it could be the doulble throttle control, or the throttle solenoid leaking internally. It also backfires pretty good too at low RPM. SR Motorsports says it has nothing to do with the tune.

My question is... Is there ANYONE in the SF bay area that could be trusted to either tune or find the problem? I live in Eureka CA so its about a 5 hr drive for me, but there is no one here that will look at it. Any Ideas? Thanks.