Hi PGSW14, I received an email alerting me of your message. It has been 3 years since my injury so I may be of little help.
I did not require surgery in the end which may be inspiring for you. It sounds like you have done similar and just waited it out for a few months and "getting by". I eventually went to physio which fixed it for me over a few months. I would recommend you seek a physio and continue with stretches for as long as possible. My physio, and people on this, agreed that Gilmore groin is very hard to diagnose. I believe it was likely that I suffered a large tear in the groin which was fixed without the need of surgery.
Going by your summary It sounds like you had a similar large tear of the groin and I think continued exercise will solve your problem but I am no expert on the matter and if you have continual pain then refer to a doctor/ physio. I had pain when doing severe lunges for a while afterwards as well but this has all but gone, I do occasionally get a twinge but I take that as normal aches and pains from sports.
I hope this was of some help to you. If you would like to know anything further ask away.