I re-soldered the diodes between 18 and 20 and 18 and 21 and also made sure that leads that weren't supposed to be touching, aren't. I turned it on and the fuse blew again unfortunately. I rechecked the resistances afterwards and they all seem to measure correctly.
I've attached a picture of how that area looks now, the rest remains unchanged from the previous pictures I've sent.