This sounds like a great plan. I am excited to see where you finish up especially since you have already been making good progress. Stick to the plan...
Overall looks great. Personally I do better with the opposite doses......200mg test and 400mg deca. Will keep the bloat down and let the deca really...
I wouldn't go past the 16 weeks. If you run 20 and then a 6-8 week PCT, that is like being on gear for more than half the year straight. Really tough...