Upgrade time! Need some advice.

Here is my current build. https://pcpartpicker.com/list/Hg7vyf

The monitor, keyboard, and mouse are all new because I am upgrading everything and they were the easiest to switch out.

Here's the direction I'm thinking to start upgrading towards: https://pcpartpicker.com/list/RPprjc

I don't know what sort of PSU i want but I would like to have something modular and I would like to use white cable sleeves. my current cable situation is nothing to be proud of :/

The GPU would be my last upgrade as I will have to do this in steps. I am just worried about the GPU market currently and I want something that will last.

My main concern is if these components are a good value for their price or if I need to go a different route. Any suggestions will be greatly appreciated. Also I'm open to possibly going with a ryzen build. Thanks!