Wait for Ryzen 3. Any 8Gb of RAM is more than enough for you so RAM isn't an issue. You just need to search for a mobo and a CPU. Also the 1050Ti is a great choice.
My PC showed me a bluescreen error a few minutes ago, rebooted and now I cant open either Windows explorer or the task manager. Its Windows 10, tried running sfc /scannow but it showed nothing.