It sounds like you are more interested in electrical engineering geared towards buildings (e.g. power distribution, lighting, special systems) due to your experience in the field. I have a BS degree in Architectural Engineering from Milwaukee School of Engineering (MSOE) with a design specialty in electrical building systems. The first two years were mostly basic engineering classes, physics classes and calculus classes tossed with some of those pesky general education classes. The majority of these classes are needed in order to pass the EIT. The last two years specialized in classes for electrical building systems. These courses included electrical theory, power distribution, lighting design, power quality and even one on the NEC. The program is ABET certified (very important when you want to go for your EIT and PE exams). My final year we worked on an actual design project where the design team basically functioned as an MEP consulting firm. Our particular project was a high rise hotel in Racine and we had to design the electrical systems including power distribution, lighting and special systems.
When I started my career out of school I was ready to go...sort of. Of course, as we all know, experience is key. Everyday I learn something new and the more time I visit job sites and work on projects the better I am at my job.
One of the downsides of MSOE is the price. Since it is a private university, the cost is about $30,000 per year. You may, however, be eligible for scholarships to help with the cost of tuition. I would not have been able to afford it without the scholarships I received. It was definitely worth it for me.