I would mock it up with no correction shims and see where you end up. Unless the ride height is really low or the perches were welded at a goofy angle you should be close.

Definitely ditch the pinion snubber. With good shocks it should never touch the floor anyway.