[jocko]

I'm not sure how much help this will be... But, maybe the pics will be of some use.
Yes, there should be shims, not sure how much though (sorry). If you're actually changing out the pinion, look closely at the top of page 6 and the bottom of page 8 - it explains how much to adjust the shim stack. But this may not be of much help if re-using the same pinion (which you probably are).

I believe the tin piece you mentioned between the pinion bearing and the gear is just the oil slinger, and it should be there.