At this point, it sounds like you are doing things pretty well. Sure you could use larger pots, but I'd only re-pot if you have more than a week and a half to harvest. Leave the fans on, and you could add a bit of molasses to bulk up the buds.
And again, check runoff pH and switch to tap water if you haven't already. You may or may not need to flush; with the extra holes in your bucket, flsuhing will be a BREEZE so you might as well do it, and feed immediately with a dilute solution (1/4 strength) of your fert as the final step.