Been there, done that. I had the laposcopic surgery to check everything was working several years ago (after trying for 2 years). I did have endo, which they fixed, and they cleaned out my polyps. I thought I was good to go. Nope. It confirmed my heart shaped uterus and helped my period, but I still didn't conceive. Not a bad surgery....no real scars, etc.
4 years and two states later, I found myself in Forest Lake, MN. We gave up trying and were going through adoption. I came across Dr. Julie Becker at the Wyoming Fairview clinic and she said I had the signs of PCOS. She put me on metformin for 2 1/2 months and I was pregnant with baby #1. It took another year of trying for baby #2. I've since had more problems with my 'junk' and had a hysterectomy 2 months ago.
I HIGHLY recommend Dr. Becker. Everyone I know who has used her, loves her. She is one of my favorite people. We've moved (again!) and I still send her Christmas cards. (It's worth the 30 minute drive north!)
Good luck! I've been there and it SUCKS!