In a 2 story house as well with a basement, ended up putting one router on the top floor and one in the basement, so we could wifi coverage everywhere in the house.
For the the enclosure, if you don't want to go with a rack. At a friend's place, we hung up a spare kitchen cabinet on the wall of the basement office to hide the patch panel in, along with the router, modem and phone, and a small ups.
Another useful tool, you can pick up or possibly borrow, a wire puller (electricians fish tape), so you can limit number holes you end up punching in the walls.
Another thought, a friend moved into an older home and we ended up running cable thru the old central vac tubing to save time, since he had no plans to use the central vac.