Well, Marc...
I think your cycle looks fine and i don't think you need to change anything about it. It's only your 2nd cycle so there's no need to do anything crazy or fine tune everything. If you want you can extend that cycle for a month, but you should get good gains with what you have already listed.
PS. there's no need to take tren A just yet, see how you respond to the basics before adding more things. One more thing, add you're deca to the test and you don't have to take so many shots.