Good job repairing that, and I'm sorry I dismissed the diode as the cause initially :-(
I had a look at the web site of your supplier, but I couldn't find any listings for discrete components, so I can't advise you as to a better diode if this one fails again.
The general rule would be a Schottky 60V or higher diode, with a current greater than 1A It is the latter specification which is most likely to matter. If you can obtain a 2A or 3A diode, that would be better.
However, I would hope your repaired unit will now give you a long service before it needs your attention again. Given that it was the diode which failed, a larger heatsink on the regulator is probably not warranted. Stick your finger on it after it has been running for a while (under normal load conditions) and see if it feels too hot. If you can hold your finger on it without any risk of burning yourself then it is fine.