You can't go wrong with more light. Consider a digital ballast - less noise and more lumens. Also, you can get digital that run all three wattages when you decide to go up or down.
Considering the light intake is on the weak side I'd say you're doing quite well! Many growers like myself started small and enlarged quite a bit later on. You're doing just fine.
My thought is this: Light figures in as the most important thing when growing. You can't damage them with more light. It takes a ton of lumens to bleach them out of their green look. Expense and heat are the two negatives in using more light. One of the best ways to get more usable material...
You are okay… There are a million things to try and do better. Weed grows everywhere. Don't let water stand around, use fans and an exhaust if possible.
After putting in all your time, money, and effort in you sure don't want to jack up your weed. I hang it for a week (average humidity). Then it gets sealed, opened, and turned every day for 10 to 14 days.