Yes, fat gain is mostly due to diet, however I must state that in my personal experience fat gain is more apparent with certain steroids. Dropping the deca is a good idea due to this.
Test/Eq/Winny is a decent cycle. You can go with that. I just have personal issues with Eq which there is no need to go into right here.
Good luck!