I forgot to mention - if you replace the derailleur with the same one, consider saving the old one. Especially given your history, you might get into a spot down the road where your derailleur is worn/broken but your bolt is still good. You could get a free swap out of it.