Personally I would not upgrade them.
(It seems to be at best a minor sideways swap. There is no evidence that much has changed other than inflation.
For example, my 80s speakers were ~ $800, and are now $5650… and while they are on their 7th or 8th iteration, I think it would be more like the 10, 20 or the 40 k$ range to see a super obvious upwards change.)
If you like DSP, then you could go with powered speakers, or add a DSP.
I would look at some modest room treatment… and probably that would be after getting REW and microphone like a UMIK.
If you are going to upgrade passive speakers, then I suspect it is going to take more $2000. Hence; I would just suggest that you love them for what they are.
Getting active speakers removes the need for the amp, so selling the amp and speakers and going active, seems like another reasonable approach… but that will gobble up 2x-4x, of your 2k$ upgrade plan.
(Maybe you could get 1k for the speakers and amp.)