There's something else you should take into consideration and that is that you are making the squish worse by placing the piston further from the bottom of the head surface at TDC. Increased squish = increased tendency to detonate. You may want to include a shave and a haircut on the block deck.