Well definitely ditch the nolva on cycle and get arimidex or letrozole FOR SURE. Also extend your PCT longer than 25 days, never ever limit your PCT but run it for at a minimum 5 weeks imo.
As far as during the cycle like i said ditch the nolva and use an AI like a-dex or letro, run either at .5mg daily and increase it if you feel the need if gyno flares up or something.