Hi, I Was Sustained Injury Which Led To Trigger Thumb.

Hi,
I was sustained injury which led to trigger thumb. The trigger thumb has been gone for months now, but pain remains at the mcp joint upon own body's resistance (without any weight bearing) with certain movements. Also, the thumbs no longer match up...the thumb that triggered now opens wider than the other when both hands are matched together making it look like I have six fingers. What can I do to take care of this situation?
Would one still do trigger surgery if it is not triggering?
Would laser treatment or electric stimulation help?
Will the fingers ever match up again?