The bulb's are much better than tubes. The tubes are great for sprouting and vegging, but unless theyre used with some other type of light, theyre useless for flowering. The basic rule of thumb is: the more light, the better. Get as many CFL's as you can afford. The 23 watt CFL's have the best lumen per dollar ratio, meaning theyre the best deal. 5 23w's should run you about 10 bucks, and like I said... use as many as you can. Id also recommend getting some soft white and some warm white.
Keep your plants together, one closet is plenty of room for two plants.