I'm watching Rec. :)
Switching to HID lighting will make a HUGE difference in your yield and quality, very good decision. As far as having fewer plants than you hoped for, just veg them a bit longer and perhaps top them before you flower them in order to fill in some of the extra space.