My MCHN is telling me the same thing about Bonnie's hammock and sometimes the transitioning concerns me too, however I think I'm just going to deal with transitioning issues IF and when they arise.

If it helps, Bonnie is the same age as your LO, and every single mother in my mothers' group has a catnapping baby. I really think the short naps are to do with the age, rather than any other factor. It's annoying, because my girl really needs her sleep and is so cranky because of the catnapping, but all I can do is try to resettle her and wait for her to get there when she's ready.