Yes that sounds like a good plan, it was just that you said 'some photo and music storage' - wasn't sure how much that meant. But most people are find with 1TB and you can cheaply buy another if the need arises.
If you aren't going for the Samsung 840 Pro SSD then a good idea would be to swap that for a Kingston HyperX 3K.
Let me know what you choose & hope that helped