Why not Schnuerle?
Given that you're doing a bunch of experimentation to make the World's Greatest Stunt Motor, I'd suggest that you make a bunch of different pistons with different baffle heights.
Or do like some of the manufacturers did in the 1930's and make a bolt-on baffle, not so much for manufacturing convenience, but so that you can have one piston/liner with good fit, and you can experiment with different baffle geometries, just by popping the head off and replacing the baffle.