driveshaft angles

So the bottom is correct? It looks like the crank centerline and the pinion are both at zero degrees relative to the ground.
Nothing should be "relative to the ground"! All the angles are supposed to be measured compared to the other driveline angles. ( the above drawings don't include the normal down at the rear angle of the engine/trans.)