Yes you can repeat the defoliation in the 3rd week of flower. I tuck where I can like you, but in flower, the very large stem fan leaves I usually take off as the stems they were powering have fan leaves of their own so don't really need the stem fan leave to boost them.
In Week 3, you want those bud sites getting as much light as possible. The plant will stop vegetative growth (leaf growth) by the end of week 4 (The Stretch), so no more will grow in the way then.