nolva could help little with water retention..
But as the other said.. go with test first.. so you know how your body reacts to the test.. then on you second cycle you could add some ed

You said you got 2 vails of test e 250mg/ml.. i think the vails are 10ml right ?
if they are.. this would be a perfect cycle:

1-10weeks - 500mg/w - test enth
10mg of nolva ed

2 weeks after you last shoot.. start pct !