I agree that separate APs are the way to go, for ideal coverage. I plan to mount a 3rd Ubiquiti Unifi AP some time soon, in a MBR closet.
Dealing with the 'best' location for the router was a PITA for me. Putting APs into convenient locations has been very easy.
