That image is an older image that does not show the wide track concept we have been teaching lately. I would widen the elbow to over 90 degree bend, keep the fingers as close to the surface as possible while keeping the body in a similar place. That would create an angle in the shoulder that eases strain on the shoulder.
I don't like giving specific angles because the body is changing position constantly so the angles are changing. Also, As the tempo increases, the angles will change. That is a problem that we got into in older versions of our work based more on the training of elite swimmers. Elite athletes make adjustments naturally where us mortals are more likely to take details as absolute.
The easiest example of this is hand entry point. The goal is to get the hand into the water silently. As speed increases, the entry point will move slightly forward. If you train for silence, you will be forced to make adjustments as your speed changes. So, when people try to discuss entering near the head, or at the elbow, those are only set to one speed. When people study elite athletes and say that they enter farther forward, that is because at 50 sec/100 that makes a silent entry for that athlete.
So, the angles of the body and shoulder will change as your stroke tempo changes. There is no "correct" angle. What you are looking for is the width that allows you to recover with the least possible effort at whatever tempo you are swimming.
Use the dry land drill to imprint the sensation of zero strain and zero tension.