A 30-year-old woman presents with right upper quadrant pain and fever. Ultrasound shows gallstones and a thickened gallbladder wall with pericholecystic fluid. What is the most appropriate definitive management after initial resuscitation and antibiotics?