I think your size is ok, With the bigger planter, increased light and increased watering you will see a jump in your plants growth.

This was taken a few weeks ago. http://www.rollitup.org/indoor-growing/6952-update-my-grow.html
My shelf is now raised almost to the top and the lights are pulled up high. The more lights the faster you go....

Light = Life

I dont have HPS because of heat... I think my CFL's are working great. They will work good for you with the right amount. There are links on the post to lights that I use. The ones I suggested to you.