I think that you are over thinking this and yes, its over kill. I think that the cycle you have been using is a logical cycle and has probably worked well. The new cycle seems more like 2 cycles, a bulking cycle and a cutting cycle. I would try to pair it down a little. I think I see 6 or more compounds here. If you wanted to bulk and cut, what if you did something like this ?
1-16
test
eq
1-8
NPP
9-16
Tren Ace
This will be totally different than what you are used to. You will have long acting compounds that help through the whole cycle. then shorter acting compounds to get fast effect. If you really wanted to add an oral for the first 4-6 wks or last 4-6 wks, I could see that, but I bet you could do just fine as it is too. Your call. Of couse, add an AI and PCT to the plan.