Hey guys, my first post on the EEvblog, been a browser and YouTube watcher for a while. But I thought I needed to chime in here. I ran across this thread searching for a solution to just about the exact same problem, my 3562a also fails the same 3 scope patterns. I also think I have at the least an issue with the same 2 diodes, at least that is where my troubleshooting has ended until those parts get in. However, if someone else besides myself runs into this thread, like I did, I'm pretty sure you have the wrong diode.
It looks from the picture that the diode you selected is the 85HFR120, however the original diode is a Schotty, also the forward voltage is 600-800mV on the original with the HFR being 1.2V, most of all I have attached a picture of my original and on the picture you have posted, the anode/cathode are in the wrong direction. Please correct me if I am wrong, but I hope this helps the original poster, or maybe someone who comes along this thread later. I have ordered the MBR7560 by GeneSiC Semiconductor as I think it is almost an exact match.
-RP