Started TH upgrade hours before update...

Now I have a dilemma on my hands. Do I finish maxing my last three cannons and one mortar during the next 14 days, or max 8 of my collectors? Only 8 because some of my current upgrades wont be done for a few days and I am going to shield for last two days so I can enter th10 with full collectors.

Also, those who hit th10 with five builders, how did you allocate your builders for the first week? I am thinking IT/AT/lab/spell/collector? Or both ITs and hold off on the cannon, AT and xbow?

Cannons and mortars lol