You are right about extending the Test. Test takes 2wks to leave the body while the EQ will take 3wks.
Your cycle is looking pretty short though
I would run this
Wks 1-11 400mg Test
Wks 1-10 400mg EQ
Clomid Wks 13-16 on a 300/100/50 split
Nolva on hand
Arimidex advised
Depends on what kind of EQ you get for the injection frequency
Both can be mixed