I completely agree with Corrina. You're routine looks awesome, and congrats on extending naps. It will work wonders in both your's and your ds's best interest. Give it some more time and see what evolves.
Oh, and definitely keep the 7pm bedtime (or 7:30) and try to give the dreamfeed between 10-11 pm. With a 7 pm bedtime, 10 pm would probably work best.