A 35-year-old woman presents with recurrent right upper quadrant pain, fever and positive Murphy’s sign. Ultrasound shows multiple gallstones and thickening of the gallbladder wall. What is the most appropriate definitive management after initial stabilisation with analgesia and antibiotics?