Revamping and upgrading a small project studio

Sorry for the double post but I put this in the wrong forum last night: I work at a studio that is now under new management and being re-modeled. The current setup was designed by the previous engineer and not the best for acoustical purposes. I've included a rough sketch-up (my first time using the program) and here's what I know for a fact: 1. The current floors are carpeted and the studio has 8 ft. drop ceilings. 2. The walls are drywall with the exception of the one I have filled on the sketchup, it's the big jail cell/college dorm brick. 3. The protusion in that same wall is a small closet that holds the internet router for the building and a few other miscellaneous things. 4. The window showing is extremely thick, very similar to the window/mirrors in a police interrogation room. On the other side is an office. The current listening position is right in front of that window with the speakers firing away from it. 5. The booth is padded in an unorthodox manner and reverberates way too much (I get a better sound in the padded corner of my bedroom than from the booth at work) 6. Budget hasn't really been determined. The studio is owned by a very wealthy man who will put forth the money to get things sounding right, HOWEVER, I doubt he'll want to do any new construction to the studio. Any suggestions for what I can do to get the best sound out of the control room AND the microphone booth??

Anybody?