Shaved Heads/Intake

i think it is the opposite. you need to remove material not add some.
the easy way to solve that problem would be to elongate the bolt holes in the intake, although port alignment would still not be totally perfect.
also, i wouldnt change the pushrod length for only a .040 cut on the heads. the hydraulic lifters will have slightly more preload.
.020 plus zero = .020.
.060 less .040 cut = .020