Perhaps. But with a double-cardan shaft on the way, the angles no longer need to match each other. Rather the rear angle needs to point upward just below the imaginary centerline of the driveshaft once installed.
I would call it very hard to measure at this point, given that the shaft does not start to go down towards the rear end for a few inches aft of the transfer case yoke. Making it perhaps not impossible, but certainly mentally fiddly, to determine the proper angle and shim size if needed.
But it'll be cool to see how close your measurements are, or if they're right on the money once the new-to-you shaft arrives.
If that 6-degrees up-angle is relative to the ground, I'd agree that's a bit of a low angle and will need some raising before the new shaft is dialed in.
paul