Very nice work.
Buttons are very tricky. I often play around with the layer style of the Text over the buttons to see if I can get a look I like. I sometimes put the text under the buttons as well.
You can try duplicating the buttons layer, then hiding the orginal layer... then deleting any buttons that intefere with your text.
And of course, you can move the buttons around to get a better look. Again, they are tricky.