After reading a thred that I had running in indoor growing forum I decided to hold off on re-potting today,it is not as urgent as I thought.
New plan: Today is the start of week 7 so I took out the 600w MH and put in the 600w HPS, installed the timer and set to 12/12. TIME TO FLOWER!!!!!!!

Why the change? My plants are not suffering yet, so put them in flower now remove males in 2 weeks then re-pot, save cost on soil by not repotting males.

I rotated plants today so here are more pics.