You can merge layers also so that way as soon as your satisfied with a section, you merge it with another to keep the layer count low...

Edit: Can you group them also in Photoshop?