Just go for the S1+ for now, wait for the methyls. And no, wait to take the 6OXO or the Nolva for your pct, just make sure that you have them on hand once you start incase of an onset of gyno, though it is a low chance for the S1+. I had the same prob as you, my first cycle of 1AD was awesome, but my 2nd was very lacking. I didn't know until recently about stacking the 4AD with it.