Second cycle plan?

[Swifto]

My first cycle consisted of Tbol 50mg/wk for weeks 1-6 and Iranian Test Enan weeks 1-14. I gained approx. 25lbs but lost 21lbs due to pneumonia.

My next step is to get bloodwork done to see how my body is currently recovering as I'm now doing PCT and have 2 weeks remaining.

The second cycle plans I have are.

wk 1-6 Tbol 60mg/ED (BD)
wk 1-14 Test Enan 500mg/wk (Iranian)
wk 10-14 Prop 50-75mg/ED (BD)
wk1-14 Proviron 25mg/ED
PCT= Nolva/Clomid
OR

wk 1-6 Tbol 60mg/ED (BD)
wk 1-14 Test Cyp 600mg/wk (BD)
wk 1-12 Deca 400mg/wk (BD)
wk 1-14 Proviron 25mg/ED
PCT=Nolva/Clomid

Questions are:

Should I increase my Test Enan dosage due to using 500mg/wk for my first cycle?
Is the Prop run for long enough? (4 weeks)

Please give your suggestions.