Nice computer! I like that you've actually updated us, what, 6 years later? Haha.
I've done the same as you and upgraded parts here and there, not just spent a fortune on an entirely new pc.
I've just managed to buy an rx 6700 which replaced my water cooled rx 480 so I had to re-do water loop...