I did the math too, and that seems right. What about deck clearance? Do the pistons come up flush to the deck?
I wouldnt touch the head. what is the crown thickness on the pistons? you maybe able to machine a slight dish in them. Its not a very big job in the right hands.