It sounds to me like your past PCT was overkill. Nolvadex and clomid should work fine, nolva still stimulates LH production. Hcg is more effective but will it kill you not to have it? Nah, but your nuts may shrink more. Hcg blows your nuts right back up pretty quick.
When it comes to PCT, 2 factors you need to look at here; # of cycles in the past and what you personally respond to. PCT IS VERY PERSON SPECIFIC, its hard just to throw a recovery protocal out there and say it will work the same for everyone. Plus guys have it twisted now, they think they can run all this shit for Pct and be 100% back when its finished. This couldnt be any more wrong, you may only come back 80%, or 50% or 30%, and it may take another 5 months to raise your natural test back to normal, or it may not come back at all. Age is a huge factor here as well.
But I see guys constantly going overkill on Pct and AI now, and then wanna know why their sex drive is in the dirt!!