16 weeks is a long time bro plus with deca.the longer ur shut down longer recovery is going to take. Whats wrong with running a 12 weeker? Its ur second cycle so take it easy. More gear doesnt always mean more gains. I would do:
1-12 500mg test e or c
1-6 40mg dbol ed
Im not a huge fan of deca. And being shut down for so long.