Is my pinion angle correct?

If you assume the rear yoke rises 2* on acceleration, then your "pinion angle" is really 0.2 +2=2.2". This is above the recommended 1.5* to 2*. In your case, I would simply add 2* pinion shims to it to nose the rear yoke (pinion gear) down by 2* making it right at 0*. Then on acceleration, you would be at a "pinion angle" of 0.2*, which is almost perfect.

I put "pinion angle" in quotes as it's really a misnomer. What we call "pinion angle" is really the difference between the angle of the trans tailshaft and the actual pinion gear axis angle in the rear-end.

I just went through this exercise on the avatar hence my input. It all depends on what you believe is the proper value for spring wrap-up on acceleration. If you belive it's more than 2*, then use a larger pinion shim accordingly.