Went from an air gap to a Victor 340 ( with a Wilson 4 hole tapered spacer)with a very similar combo to what you are presently running ( except 408 and much heavier car ) and got positive results shifting at 6200. With the carb and gearing change you propose, I think you will run out of manifold with the air gap - even with OTB heads.