Run the cycle as planned, but you might consider adding in 3 extra wks. After last pin of Test-e run 3wks of prop. Or, if 15wks is the longest you'd want to stay on, at wk 12 switch over to prop...either way, after prop is over, immediately start PCT rather then waiting like you'd do if you ran test-e until the end.
Also, dropping 4% of your BF and gaining mass, doubtfull and I think you could be setting yourself up for disappointment...that would be dropping a little more then 10lbs of fat while adding mass...most people can not do this. I know you mentioned that test-e in the past has melted the fat right off of you, but I think you are mistaken. Test-e does not burn fat, diet and cardio burn fat...this is not opinion, it's fact. Now, that said, sometimes when you go on cycle and when you drop some fat, more often then not although you are "leaner" you do look bigger...but like so many things in BB it's all illusion. This is not a bad thing, it's simply the way it is.