Here is a sketch using the dimensions that you provided via text. I used the angle you provided on the driveshaft and it appears that there's about a 5/8 inch discrepancy between the angles and the height measurements. It looks like the current angle between the diff flange and the driveshaft is 6.7 degrees, but would be a bit more using the height measurements.
I am going to be raising the transfer output to make it an even 30 and I would go off of the height measurements because my method of finding the shaft angle is sketchy to say the least. So what does this all mean as far as what I need to do to make everything kosher?