Surges under medium acceleration
My thought would be more fuel related. Remove the air filter and test. If you see a change then you know it is fuel related. Concentrate on that area. Replace fuel filter, air filter and move to high octane at a different station at the next fill up.