I would bump your test up a lil bit maybe 400 mg/w.

everything else looks good, but remember dotn take the nolva unless you absolutely need it