I might as well just go ahead and replace the PSU too, so the rating is up to date

A good PSU will have an 8-10 year or longer warranty so that'll should a couple of refresh cycles or more usually. Especially if you're upgrading every 3 years (I'm on a 5-10 year cycle, or more accurately a "whenever a key component dies or is truly no longer up to the task at hand" cycle)