The Rambam rules that in Arab lands where it is the custom to wear a hijab, it is a lack of tznius to go without one. That would seem to support the view that minhag hamakom is based on the custom among non-jews. But that seems to only be that case when it's לחומרה.