Forgot to update a few things:

GPU changed from Rx 480 to Sapphire Radeon RX 5700 XT Nitro+ 8 GB
Also added an EVO 860 1 TB SSD (for frequently played games).