Swap pistons for quench?

You said you were planning another engine for the future. Put this engine together as is with the pistons you have and stick in a smaller cam. Save the bigger cam for the next engine and you can build the compression and quench to match.