A 45-year-old woman presents with recurrent episodes of right upper quadrant pain after fatty meals, radiating to the right shoulder, associated with nausea but no fever. Ultrasound shows gallstones without gallbladder wall thickening or bile duct dilatation. What is the most appropriate management?