Aux fuse box/switch wiring question

I'm thinking about installing an auxiliary fuse box in my 2014 TRD sport for wiring a few accessories. Right now I have a water pump (for washdowns, showers, etc) wired to a relay and then to an electronic push switch in the dash (by ch4x4, rated for 3 amps) wired to a fuse-tap in the fuse box behind the coin thing. It's then connected from the relay to the battery.

So since I'm thinking about adding some more accessories, I'd like to use an extra fuse box to keep it clean and organized. My plan is to wire the fuse box to a 100A circuit breaker, and then to the positive terminal on the battery, as seen in many threads that I've read through (it will likely be housed in the engine bay next to the firewall). Therefore, the connections on the fuse box will be hot all the time, which is probably best for most of the accessories I'll add (bed lights and under-hood light planned for near future. would want these to come on without the key in the ignition).

Now, my water pump is tapped into a fuse that is on when the ignition is on, only because this was the best available circuit to tap into via the fuse tap. But, I'd rather have it on even with the key removed, so I'd like to switch the wiring to the new fuse box. I'd also like to eliminate the need for the fuse tap anyway. So, where do I move the connection for the switch? Would I have two connections into the new aux fuse box for the water pump, one for the power to the pump and one for the power to the switch? Is there a better or cleaner way to go about that? I'm very much an electrical novice, wiring the water pump was my first project in this area.

Thanks for any help!

 

Also I don't know if it matters but I think I'm leaning towards the blue sea 12 fuse box.