O no! Looks like you are creating a soon to be bigger issue with HCG. HCG is, to many people's chagrin, nasty stuff to human males. It's intended purpose is fertility however it's administration is clearly proven to be at high dose, short duration in an effort to promote healthy sperm to impregnate a woman. You said it yourself, 500mg of various test esters created no issues and I would bet 10 to 1 the nolvadex was not needed at that time.
If you are self TRT'ing I hope you stay with what the body really needs and if that's 90mg/wk great. 100mg/wk puts me at 375 5 days after injection which is perfect. I play with NOTHING while on TRT and when I blast it's what I want which is within reason. Why not have fun with a blast if your bloods come back well? Keep it reasonable and the body will bounce right back. Trying to walk the balance beam with AI's, prolactin removers, etc as a result of what we put into our bodies is difficult and based upon experience from my very first cycle in 1992. If I keep it simple things tend to go pretty smooth, when I start kitchen sinking cycles, coo coo switching between compounds (such as being on deca for 12 weeks then switch to tren, holy shit what a mess!) or over thinking things is when I get into trouble.