It certainly has taken Tomoya a long time to try and get over Nagisa. I'm surprised they fastforwarded 5 years. Based on the preview, Tomoya still has his many issues of depression and anger. But it'll be interesting to see whether Ushio will have any effect on him for the positive, or he'll just end up the same. Maybe he'll reflect on what his father was like, and that will push him to become a better father.
I also thought the ending was much better. The skipping in the beginning of the ED was actually Ushio, and the lead into it was much better.