You might want to try different pump cams. I know when I switched from my Air-gap to a Victor I lost about 0.05 in the 60' (but I gained 1.5 mph). I got the 60' time back to normal after changing pump cams and raising the launch RPM by 500....just something to try.
For the OP, Yes to the Air-gap.