Hi
I have moved to the 7/7.30am wake up routine and my little boy goes to bed by 7.30pm (I did the same with my lg too). Generally the baby day is 12 hours so I would select a time you are comfortable with and go with that - could be 7-7pm, 8-8pm etc. I have always preferred earlier nights to get my evenings back and prepare for nursery/school routine.
That way all your naps will generally be 9.30 for an hour, hopefully 12-2, then 5-6pm ish xx