Hi Shan,

Ive recently gone through the same thing with my DD! Our routine was almost the same as yours, but now looks something like this:
6am wake/milk
8am breakfast
1130am lunch
1pm milk/sleep (she has now been sleeping till somewhere between 3-430pm!)
waketime/snack
530-6pm dinner
630pm bath/read/bed

Its working really well! She is going to bed earlier now, 730ish where she used to go to bed at about 830pm. We were really struggling to get her to sleep before, but now its great!
HTH, all the best