To echo the last few posters, keep Jiko. It's completely worth it. Great menu, great specials, great wine list, and no matter how full the place is, you never feel rushed or crowded. It's one of the three best dining experiences in the whole of WDW, in my opinion.
If it's your thing, there's also a nice, relaxing bar above the restaurant, called Victoria Falls, that overlooks Boma. We eat at Jiko on every trip, and we also stop in at Victoria Falls for pre-meal drinks before those meals on every occasion.