Have you ever thought about 1900 Park Fare? It has Cindy, the Fairy Godmother, Prince Charming and two of the mice I think. I'm not sure about the dinner at either CRT or PSD. We did breakfast at both places and both were very good, but Cindy was not at Akershus. We are going in November and we are going to try 1900 Park Fare for Dinner. I've heard from many posters on the DIS that its a very good meal and great character interaction.
Good luck making your decision and have a magical vacation!