Yes, 6 weeks of clomid should be minimum IMO, so your new plan seems much better to me.

I did not express myself very well (as usually)- E2 sides are more pronounced with untreated hypothyroidism- if you're taking synthroid (and conversion to T3 is decent) than you are OK as your hormone levels should be good.