My 1st thought for both of you is: Be aware that light intensity is a BIG key to larger yields, and tighter, denser buddage. There is nothing that can outweigh the light penetration of a 600-1000 watt HID lamp.
When I 1st started I bought a 250 watt hps, and a 400 watt high bay MH. They did the job, but did not cover much grow space. I tried CFL’s like you have, but the light penetration is moderate at best.
I have also found that if you do not have intense lights, and you have above average RH; Your buds will be airy, and lack density.
My lamp collection includes.
1 1000w HID-Hortilux 147,000 lumens
1 1000w MH Sunmaster Gold, 100,000 + lumens?
1 600w dim’ digital switchable, with air cooled hood
1 400 dim’ digital switchable with batwing
1 250w diamond self contained hps for side lighting.
1 2’ 4 tube T5 for seedlings
Invest in Light intensity, and work from there. You will get more bang for the buck and a faster return on your investment.