Based on the lively discussion here is my final attempt at a remapping of the neighborhoods. As J said, it's meant to be an organizing scheme not a statement of absolute Truth. Check out the image here or on
Google maps. If other want to create a version I think you can click "Save to my maps" and then start editing your own version.