Pinion Angle? Do I have this right before I cut it up?

Measuring the tailshaft as you are doing is not accurate. See if you can get on something on the block, even the trans pan is likely more accurate than the tail shaft. The shaft is unsupported as you are showing it