Hi, thought I would offer our experience....it has been 3 months now since we went form 2 to 1 nap.....it was exactly as you described....short naps and night wakings! We were all of the place for a while. He is settled down now and his routine is 6.30 wake, 12.30 sleep (2 hrs) and 7/7.30 bed. He still wakes occasionally at night if his teeth are hurting, etc....but all I can say that I did was be consistent and he finally got the hang of it himself.
I got advice from here and basically the BW ideal is 7 wake, 1-3 sleep and 7.30 bed....and tweak to suit your baby. I found that if I put Andy down between 12 and 1 he is fine...after that then I am in trouble and he is harder to settle. If he wakes from his nap after 1 hour or 1.10 I try and resettle him...if it has been an hour and a half I tend not to worry and go for a slightly earlier bedtime. Likewise if he gets up at 6, I move everything forward 30 mins. I also found if I put him down before 12 he tends to have a shorter nap so I stretch him to 12 even if he is up at 5!
During the transition I would say that I had to amuse him a lot in the mornings to take his mind off being tired..he still tends to wilt around 9.30 which is when his nap used to be....I give him morning tea around that time now and he peps up again!
Hope our experience helps,
Andy's mum