don't take this the wrong way but ...

you don't seem to have the skills to correctly tune it , and seriously sometimes i don't either so it will be money WELL SPENT to take it to a shop with a chassis dyno that can duplicate actual running down the road and tune out that surge , correct the A/F ratio and get the most power out of the engine .

it's a no brainer