As the existing design has an obvious design flaw (hence the reason for the diodes mechanically breaking), is there space to fit a different diode the other way up?, and solder wires from the diode to the PCB?. This would solve your pinout problem, and cure the breakages.