Port my current M1 single plane or install the RPM Air Gap?

I'd say with the cam and gears you have, the AG is going to work better in the rpm range that engine will run in.