Upgrade advise

[Technicolour]

Firstly some background information, my current machines:

 

Desktop: i5-2500K @ 3.3Ghz, 16 GB DDR3, GTX 970

Server: Xeon E3-1230-V2, 24 GB DDR3

 

Recently had to rip 8 GB or ram out of my desktop (was @ 24GB DDR3) and put it into my server (was @ 32GB DDR3) as I was getting instability and BSOD's in my file server VM. The ram is under a lifetime warranty, and hopefully I can get a copy of my invoice from my retailer but it was purchased back in 2013. The other fun part is that I would need to return all 32GB for RMA as it's a kit and 16GB of it is still in the server. The estimate is that I could be out of RAM for 2-4 weeks, and my server is actively used daily for Plex + home automation (first world problems but harder to live without after getting used to the bliss of having it). I also live in New Zealand and the RMA would be to Ireland (almost literally the other side of the world) and so shipping there is ~80NZD.

 

2020 finances were being planned to do a decent upgrade to my desktop as it's due and I'm pretty interested in Cyberpunk 2077 but now I'm also faced with potentially needing to upgrade my CPU/Mobo/RAM in my server as well.

 

I was looking at a Ryzen 7 3700X (for software dev) on X570 for the desktop along with a RTX270 Super and potentially would do somthing very similar (sans GPU) for the server. The part that concerns me a little is that it seems like I've synced up a little too well with being at the end of the DDR upgrade cycle and have almost skipped DDR4 all together with DDR5 being just around the corner? I'm also keen to have a decent enough upgrade path where I'm not forced into purchasing a whole set again, the used parts market is a little less friendly in the bottom of the pacific.

 

I think I've rubber duck'd my way into telling myself that I should probably just hold out until Q2, buy current gear and look to resell earlier to get into hopefully a better part of the cycle going forward but I'm interested in your thoughts.

 

Do I?

• Sacrifice my desktop for up to a month, pay $80 and get my ram replaced?
• Suck it up and go all into AM4?
• Buy a replacement DDR3 kit for my server now? (2/4 sticks a definately bad, a 3rd questionable but I could just get another 16GB)
• Wait for more information around DDR5 and make an educated decision then?