Looking for some advice as I look to tidy up my home network and get the structured cabling sorted nicely!

What I currently have....

1x Dynamix wall mounted comms cabinet  (5 RU I think)

1x 24 Port Cat6 Patch Panel (racked)

1x 48 port Cisco 2960-X POE Switch (racked)

1x Frtizbox 7590 Router with 1000/1000 Internet (non racked)

1x Nuc  (non racked)

1x QNAP Nas (non racked)

On my network I have

6x Rooms with Cat6 cabled to them, 5 of them active with devices. Likely to add another 4-5 later once I get around to running the cabling.

1x Grandstream WAP 

3x POE Cameras

I have two current issues

1. I cant close the front door of the rack because the Cisco switch is too big, so I either need to replace the switch or replace the rack

2. Wifi performance/coverage is poor and I either need to Replace/Add hardware to fix this

I was thinking that my best bet is to replace the Cisco switch as it is a complete overkill anyway and I can get something smaller that will fit in the rack, solving problem #1. Though, should I look at going a step further and getting a rack mounted router and doing away with the Fritzbox as well?, this will tidy it up some more. 

For the Wifi, I am thinking two WAP's would probably be better, one upstairs, one downstairs, is it as simple as that or should I go mesh? Is there an advantage of going mesh instead of two WAP's when I have the capability to run two cables to the WAP's?

interested in everyone's thoughts on this, not apposed to spending a bit of money to sort it once and for all. Thanks!