I dont know about a step head piston but one of KB's offerings that would give him quench with the closed chambers & ending up with a CR in the 10's would suit his purposes perfectly.

live every 24 hour block of time like it's your last day on earth