Another pinion angle question

[cornerstone]

I think I know what the right thing to do is, but I’d rather have y’alls brains in on this as well. Here is the situation... I went to a local driveshaft shop in town and inquired about ordering a new driveshaft with a slip yoke for my 6L80E. After our discussion he told me I need to have my pinion angle set at ride hieght before I measured for the driveshaft, since the length would change as the axle rotates either up or down. That sounded smart.... so here’s what I have currently.
My differential is angled up 7 degrees and my transmission is angled down 4 degrees. Since it needs to be within .5- 3 degrees of parallel, I think there may be 2 or 3 options here. The first is to shim the differential down 5 degrees. The second option is to drop the tail of the transmission another by 2 degrees. Or there’s the third option which would be to find a compromise between the two. Am I way off here? Thanks in advance!
Brian