Thanks. HenaV - not sure how the link helps though, it suggests 11.5 hours at night and 2 hours nap, then at age 2 11.5 hours at night and 1.5 for naps.
I have been sticking with the 12:30/12:45 nap time, but the results are just inconsistent. And if I put him to bed earlier than 7pm, sometimes he wakes up earlier, sometimes later. It's just all over the place.