agreed, you can leave the TEST @600mg wk, but bump the deca to 300mg wk. and yes, get some anti-e.
also, if you have the $$, wouldn't hurt to put 4-6wks of D-bol at the front.. 30mg ED should do you great.
~R