2 years of being clean means you are virtually starting from scratch albeit a little heavier now. This means you will most likely get awesome gains again from 400/w test. There is nothing wrong with what has been suggested above but many a good cycle was kept simple with test only. My 2 cents...