When you go on cycle, you will gain some extra fluid. Some of it will go sub q, making you look a little more fluffy at times, but a lot of it will go into the muscle cell. This water in the muscle cell will stretch the muscle out, fill it up and make it look much more round than it was before. Once you come off of gear, this fluid slowly goes away. What you have left, about 6-8 wks post cycle, is the muscle you actually gained. So at that point, if you think that you didn't do as good as you would have liked to, something might have been off in your diet or training or rest. You have to have that diet nailed bro and from what you're saying, it sounds like this is where you might be lacking. I would spend some time here at the QA looking at the info about diet and if you want more help, ask me how to deal with the areas you are lacking.
As for a cutting plan using test e as the base, anavar is a great option for a second cycle, but we can also do something like this :
1-12
Test e 250-500mg EW
Adex .5mg EOD
5-12
Winstrol oral 40mg ED
PCT starts 2 wks after last shot of test
Get that diet nailed and use cardio to help with additional fat loss. After you have a solid grasp on your dietary needs, and you see that you are able to lose fat, consider adding in some clen or ECA