Test E or Cyp @ 500mg/week and Deca @ 400mg/week (assuming your deca is 200mg/ml and you have 20ml's of it) will work wonders!
Actually test alone will be great as well. You could run the Deca at a lower dose, 200mg/week just to get the joint soothing benefits. Try this for 10 weeks
The different kinds are the different esters which dictate the half-life of the Test in your system. Test Ethanate or Test Cypionate are very close and I would consider them interchangeable. Either one would be a good partner with the Deca as Deca and Test Cyp/Eth are long acting.