Good luck with the fixing up, keep us posted about your plans.
An RTX 2060 is very decent for 1440p gaming. So even if the budget is reduced, there are still a lot of options for a great gaming PC.
These are rumoured to come out mid-July. They'll probably get announced in advance. The biggest beneficiary of the refresh seems to be the RTX 2060 going to the RTX 2060 'Super' which as well as getting more cores like all the cards also gets 2gb VRAM and more memory bandwidth. The expectation is that the new GPUs are a response to AMD's Navi cards, and that as such they will (surprisingly) sell for the same price as the current RTX 2000 cards instead of being marked up. Making the 'free' upgrade on an RTX 2060 quite attractive. And further undermining the reason for the RTX 2070's existence...someone also posted about nvidias new cards so is that going to mean longer waiting?