Kendall,
First off, thanks for the questions!
I would keep the January 2 dinner at the California Grill. Dinner there, paired with the 9 pm Wishes, is about as magical and memorable as you can get.
As for your plans for the 5th, first off it seems that the schedule must have changed since you looked last, because the site says that Hollywood Studios closes at 9 pm. So there is one more hour of fun for you!
But what after that? If I were in your shoes, I would stick to simple. I would hop on the Friendship boats just outside of the park entrance and go over to the BoardWalk. I would walk the planks for a bit, but eventually wind over to one of the different lounges. Depending on the mood I was in, I would consider Jellyrolls for some fun, ESPN Club if you are sports fans, or for some more toned town time together you could go to the Big River Grille & Brewing Works.
One other great choice is to go to Port Orleans Riverside, to the River Roost Lounge, where Yee Haw Bob may be performing. Check for that day when you get there. He often has performances starting as late as 10:30, and they are fun and festive. Memorable, to be sure!
There are also a few choices at Downtown Disney and some of the other resort hotels, but you should only consider some of those if they are convenient to wherever you are headed for your resort stay.
Let me know if I can help more!
Have a magical vacation!