Yes #307 on the first diagram, and #7 on the second one. On my 99 Burb 5.7 vortec, I replaced both of them when I replaced the water pump. The #307 one that has more curves, there was a Gates item for that. The elbow one,#7 IIRC I used Gates # 20338 for that one and trimmed it a little. The other hose (#307 in diagram) is #19205 according to my service records ( that's an O'Reilly part number, but their private label hoses are Gates).
The 20338 is a Ford bypass hose, but it had the correct size and angle. Been on there for over 2 years and no issues.
That hard line that was mentioned, goes around and under the alternator, over to the side of the engine where the other part of the heater hose is. There's a bracket on it with a bolt that goes into the accessory bracket. I took the bolt loose for easier access to the bypass hose and clamp.