RE: the catnapping issue
My little lad (now 6 1/2 months) decided at 3 weeks that sleeping during the day was for the birds! I struggled through the next two months, sobbing, stressing, tearing my hair out trying to make him sleep longer than 40 mins (sometimes 20) during the day, because everything I'd read (common story here) said that 40 mins did 'nothing'. But the little one basically slept through the night from around 11 weeks of his own accord. (give or take growth spurts and now teething). And eventually I saw the child health nurse, who said calmly.. 'it's fine... as long as he's sleeping well at night' (there are some good ones out there).
so i let go, and he sleeps for 40 mins almost exactly, 3 times a day. And mostly 11 hours at night.
do what's right for your baby!
cheers
Bid