Typically when you are setting up your lift height and have adjustable arms, you would pull the springs/shocks, lift the axle to full bump and adjust the lowers until your axle is centered within the wheel well and your upper cups are close to centered to the lower spring pad.
This is also how you would adjust your bump stops for a bigger tire size.
In your case Ron, you are kind of reverse engineering your lift by changing the lift height from the previous lift. What we don't know is what length your front arms were adjusted to. Now that you have a shorter lift, your arm lengths may need to be changed to get your setup right. As yours sits right now, based off your angle measurements, the pinion is sitting pretty high compared to the DS angle. In this situation, you could adjust the uppers to lower your pinion angle so it is closer to the ds angle.
With the jeep at ride height, you could support the axle with a floor jack, them remove one upper arm. With the floor jack positioned so you can lift/lower the pinion, use the floor jack to relieve the tension on the remaining upper arm. I don't remember which side of the diff relieves tension, so you'll have to play with that with the floor jack. Once the tension is relieved, it should unbolt and be removed easily. With both uppers off, use the floor jack to adjust the pinion angle. Once adjusted, install the uppers. Try to get your pinion angle in line with the ds angle at ride height. For safety, put some jack stands on the axle tubes loosely supported, and chock the tires.
