With regard to cycle #1, I think you would want to run the test out to at least week 14 considering you are indicating Deca wk 1-12. The deca will last about 14 to 17 days in your blood, I believe, with test prop only a few days.
Cycle #2 looks fine to me, although running prop for 14 weeks...