Upgrading my Current Computer

I am starting to get more money to upgrade my pc i usually play MMO's and MMORPG so i want to keep the price down but still have a good experience as i will be upgrading my current computer buy purchasing parts along the course of this year.

Current PC: https://support.hp.com/us-en/document/c04293928

PCPartPicker: https://pcpartpicker.com/list/hn8xKZ

ive been thinking about changing the CPU to an Intel Pentium G4560 adn the power supply to a semi or fully modular corsair power supply to keep the cost a little bit down. also I want to know is there a way to get that case and still have a mother board with enough fan headers? all the micro ATX motherboards only have like 1 case fan when my case has 5 fan mounts. Suggestions and inputs are appreciated