Since the surround is done I thought it wise to begin mocking up all the pieces as best I can on the table. Here's what I came up with:

The signals need to come down and out while the gauge needs to move in. The buttons can stand to be moved closer to the dash as well, and I even had the thought of placing them on the surround (the piece that was just covered)--but have since talked myself out of it as I wouldn't want the LED's to cast light in that location.
Here's what the buttons look like illuminated. If anyone has any further alterations they wish to suggest feel free to post them.