Pinion angle help needed.

You're only a couple degrees off. Shim it and be done with it.