Test cyp and test e are very similar. Test cyp has around a 10-12 day half life on average, while test e has just a little less, maybe 9 days. In the real world, you will not notice the difference between the two. For either of them, I would do 2 shots a wk to reach your weekly total mg. How many vials you need will depend on how you dose it. If you want to take 500mg EW, you will require 2 ml a wk. So 12 wks would require 24ml total, at that dose.
I understand you've done some PH's but they have nothing to do with Deca. At this point, I would probably hold off and consider using it for your next cycle. Still, if you want to avoid fluid retention, deca might not be for you. Its one of the better bulking compounds out there, but with deca comes a little fluid, just like dbol. After this cycle, you might want to look into EQ. Test and EQ is a good plan for cutting or bulking, and it won't give as much fluid. And on the note of water retention, much of it has to do with diet and estrogen control. You can look just fine, holding a few extra lbs of water, if it's in your muscle. And don't worry about "keepable" gains either. If you come off and you lose weight right away, it wasn't muscle anyway. It was fluid in the muscle. But fluid helps you grow. It helps to deliver nutrients and speeds recovery. It also makes you stronger. So don't be afraid of gaining a few lbs of water if you want to grow
As for an oral to take with your test on this cycle, either would work fine. I'd prefer dbol. I think it works well and at lower doses, making it more cost effective. I also have seen OT cause more issues on cholesterol levels. If you use dbol, I'd go with 30mg ED. With OT, 50mg ED. Here is how I would lay it out :
1-12
Test E or Cyp 500mg EW
adex .5mg 2x wk to EOD as needed
1-6
dbol or Tbol
PCT starts 2 wks after last shot. If you use Nolva, 40mg ED for 1 wk. Then 2 more wks at 20mg ED