My personal vote for your scheduling would be to split Epcot up between the two evenings. That way, you can spend your WS evening taking your time, maybe eat in one of the pavilions (I strongly recommend Morocco, BTW), do the attractions, and have time to shop. Then I would stake out a spot for Illuminations no later than 8:30. You can then have a separate evening for FW to ride, ride, ride.
Epcot "can" be done in part of one day, but you miss so much trying to do it all at that pace. There is so much to see and absorb, especially in the WS, that you really don't want to feel rushed.