Your current set up looks more than capable, like the others say it might be good to wait for Zen 2. However, if youre expecting to have a windfall again by the end of the summer (you said you would get a monitor in the summer if you spend the money now) I would tbh get the monitor and new HDD now and then get zen 2 at the end of the summer when it's been out for a month or two and you have a good idea of what you'll gain from it
Bananamuffin got a reaction from Gnomo in 500-600€ for upgrading