Got back yesterday. Here's what we ended up doing:
Stayed at Port Orleans Riverside. Liked it, not loved it, but it was good enough.
Went to Magic Kingdom day 1. Spent all day. Went to Naccossee's at Grand Floridian first night. Best meal of the trip. One of the best steaks I've EVER had.
Went to Epcot day 2. Was fun, but Epcot felt old to me. Test Track was good, didn't like Soarin'. Ate at Biergarten in Germany. WAS AWESOME. Went to Animal Kingdom in the afternoon - all we did was ride Expedition: Everest (but I'm not a fan of roller coasters in the dark, and this one was in the dark and backwards, so I only rode once). Went back to Epcot and ate at Hacienda de San Angel in Mexico for dinner. Really really good.
Went to Hollywood Studios day 3. My favorite park. Tower of Terror is as fun as advertised. Did all the shows, rides, stayed all day. Ate lunch at Sci-Fi Drive in Cafe. Didn't like it too much - too quiet and weird. Went to Downtown Disney in afternoon, changed Jiko reservation to go to Fulton's Crab House for lobster, ate like kings.
We saw the Electric Parade, fireworks at MK, the water show thing at Epcot, the parade at Hollywood. We did the Deluxe Dining Plan and I think it was a good idea, though we probably paid more to get it than it would be out of pocket. Does seem weird that it doesnt include tip, but whatever.
Trip was great, suggestions on here were spot on. Thanks everyone.