I guess measuring the squish angles in the head was not something our machinist normally does. After much hand wringing, and some emails with our him, I took the head back to him for review.
In short he wasn’t comfortable modding the combustion chamber any more, for fear of getting into the valve seats. The only other options are to modify the piston crown, or get different heads.