I don't give a hoot about the trans output shaft angle, as long as the front U joint is not aligned perfectly with it that is Which from your description it is not
I look hard at the angle between the pinion shaft and the rear of the drive shaft angle, I like to see a V at the pinion yoke with 2 to 7 degrees difference with the pinion pointed down towards the ground or parallel to the ground , not pointed up towards the tranny yoke
IHTHs