Heh, I had that happen last grow. I veg'd my plants too long (out of necessity, had to leave town and didn't want them flowering until I got back). They got too big, then in flowering they exploded into growth and I had to tie them this way and that way throughout the rest of flowering to keep the lights from burning them.

So, your plans both sound good. I'd leave them in the 2g pots. Not really a great idea to shock them with a transplant during flowering anyway. And tie them however you must to keep them from frying on your lights. That didn't seem to bother my plants at all, they adjusted fine. Don't really see that you can do much else; it'll probably be a struggle the rest of the way...but it'll be worth it!