help with two piece driveshaft angles

The car is a Volvo 240 with LS/t56. I am having some driveshaft vibrations, mostly when leaving from a stop. I have included a drawing of how my angles are currently.

The pinion angle is incorrect, but the rear upper links are adjustable so that is easy to change. I am thinking that if I shim the rear of the trans upward to get it to about 3° down it will get the working angle of the front u joint closer to about 2°. Then adjust the pinion angle to 3° up, and I should be good? Moving the center bearing will be kind of a pain, and I don't want to if I don't have to. 

Why are you running any up angle at the pinion?

To me it sounds like angles are a bit phucky.

I thought the pinion angle is supposed to be equal to the transmission output shaft angle in the other direction.

The plan sounds solid, it should leave your trans output and pinion parallel to each other with the center bearing at about 0. If the center bearing doesn't end up close enough to zero, you might have to move it...