I would go for what your surgeon advises in this case.
With me, the pain from the gallstone came and went every few weeks for about 4 years. It hurt for 4 to 6 hours, mostly at night, and had vanished by the time I saw a gp. Until it got infected and I ended up with a very high fever and lots of pain. I then had to wait 6 weeks until the infection got better so that they could operate without trying to find their way in swollen, infected tissue.
Turned out it was still infected when they did the op, so they had to cut off a piece of my liver to be able to reach my gall bladder. (Yes, that shocked me, but they told me it would just grow back, so I suppose it did)
I still got to go home the same day (after a bit of a struggle) and went for a week long sailing trip two days later (not advisable but it was a great trip). Took about a week until I could do almost anything I could before. And I eat anything I ate before without problems.
No idea if this information is useful to you, but I'm not a doctor and I've no clue about any risks, so I thought I'd tell you how it went for me. Personally, I'd want to get rid of a hurting galbladder as soon as it started hurting, the pain is horrible.