If there is anything I would taper it is Deca. Although I will never use Deca again, I have been made aware of the benifit of tapering. Keep the test going, and get the deca done by week 10.
HCG throughout will help a lot. Preventing the atrophy is better than having to fix it later!