Good setup, the only thing I would look into is your Graphics card. Right now you have 1050, although it's not the worst card it's definitely not known for its high performances. I recommend taking a look at something like a 980, or possibly a 1060/70.