For me it would depend on what time MK closes? Is it an early closing and you won't be returning or a late closing and you want to get back?
If MK closes early, you might want dinner to be an event in and of itself, in which case I would suggest HDDR, a dinner show, which is in our opinion, one of the best events Disney offers. You can take the boat from MK to FW. Another option if MK closes early, would be a signature dining experience, either at Narcoossee's or Artist Point. Of the two, my family had a better overall experience at Artist Point, and since you are already dining at GF at Citricos, I would highly recommend it.
If MK closes later and you want to return, I would do something quicker, like Kona Cafe or GFC. We didn't care for The Wave, our dishes were very hit or miss and the atmosphere felt more like a Cave (you may enjoy that kind of thing). Kona has become one of our favorite restaurants in Disney for all meals, and we don't think it's too much like 'Ohana at all. GFC gets very good reviews and someday we will try it. We have done 1900 PF and while I wouldn't recommend it for the food, the characters were a hoot. We also really (still) enjoy Chef Mickey's. The food is pretty good, better than 1900 PF, and the restaurant is in the Grand Concourse, and it's fun to just be in there, with the monorail gliding overhead.
Please tell us what you decide!