The house is small (1200 Sq ft) so with the new router (installed today temporarily where the modem is) I have great 5 Ghz coverage throughout the house, I had considered running a spare cable for an AP but I won't need it using a non-ISP router,
Budget is tight, I'm doing all the work myself and work at a big box store so I got a discount on the Cat 6 cable and crimp kit, amazon seems to be the place to go for inexpensive keystone jacks (I won't be connecting/disconnecting from them often so they should be fine) and I would like to not use more than about 400' of cable, I bought 500' but would like extra to make patch cables for this house as well as my parents house.
I think I'm going to end up running 2 lines from the router to the office and then running a line between the outlet above the office to a spare port in the office so I can simply plug a patch cable into the switch if I need ethernet above the office.
Since I'm running a line to the other upstairs room I might as well run 2 also, I don't see a use for it currently but if I'm doing the work already it's pretty easy to double it up.
As for wiring other rooms I don't have access to the living room/main TV area to run cabling through the wall because of the house design, the best I can do is run a line off of the switch In the office alongside the baseboard, tuck it into the storage space under the stairs and then pop it out behind the TV to either plug in directly or put another switch, not super clean but better than nothing. I personally don't see a need right now for that unless I end up building/buying a NAS to use as an audio server as my sound bar offers a service to connect to a home media server.
Thinking about it I may end up with a second switch in the attic if I want to run ethernet security cameras, but for now I think the 4 ports on the router will be just enough.
Thanks for the help and advice guys, I hope to have everything completed (including drywall work) by the end of next month, I'm already excited to have the better speeds and coverage just from the new router in a less than optimal position.