Why don't you put the tray in the tent, so you don't have to move the plants so much?
i think 3 more weeks of veg will be too much, I would just switch now, and where are you going to flower 30 plants in 150 days when those are going to be done flower those plants in your current plan?
Good luck and keep us posted..JR