Yes, and eventually they get him into a set of less painful eyes. Yay for him. I've seen no evidence that he's stopped complaining about his sight.

As for the Riker thing, turning down a gift from a friend because this is the only way to help said friend, that doesn't count.