Considering you have hundreds of locations, breaking them up into physical locations may be a bit of a hassle, but this is probably the best option. Of your initial two options, I would recommend the first option, especially due to some regulatory issues with AP's being from differing regions but placed into the same network.
... View more