I would of thought to get the compression so high it would be pinking the surface grind would of had to take a big chunk off, normal surface grind is only a few thou.
21 inches vac sounds good to me , is crank reluctor ring on front crank pulley or on flywheel ?
If the knock sensor got disturbed or damaged could this cause it to go over advanced ?

Can you get the firing degrees reading from live data on your scan tool just to see what its doing
?