Okay here a few tips for you:

- 16/8 light cycle is for your vegetive room
- 12/12 if for flowering (budding)
- HPS lights are better for flowering
- I use cfl's (compact florescents) for Vegetive but you can also use metal halide

Your new room could be for either veg of flowering. What are the dimensions of both rooms? Did you say the new room is a closet? If so your gonna have bigtime temp problems with a 1000w hps in there. Your gonna need a good exhaust fan, and a temp controller would probly be a big help in a small area.