I'd be surprised if your analysis is correct. Your mileage over two years is unlikely to have worn out any "decent quality" component. However, if I'm incorrect, replace your derailleur with Deore or above. It seems that is the level where long term durability over significant mileage and truly decent quality begin.