Yes, cutting off the water leaves if they are blocking any buds from getting light and properly growing is a good idea. You can also try a reflective material to bounce the light back up to the bottom of the plant. (I'm not an expert but from my own research this seems like the best idea, not sure if it will affect your "super cropping" or not)
Plan on the growth sticking over the side of pots at least a foot if you grow them right, then you want room to walk between pots, so I would say rough guess........... 4 feet between pots, and 2 feet between pot and walls (I am assuming you are doing in a room or greenhouse?)
Remove all lower growth, branches that don't get much light. It will put more energy to the remaining branches.