Was it difficult to transition to some other arrangement for naps?

DS is 6weeks old and very sweet, but he's also becoming quite opinionated. Nighttime sleep has been--and continues to be-- a challenge. He's sleeping about an hour and a half at a time in the RnP, while tightly swaddled. Naps occur on a person, because setting him down, he wakes after only a short time and becomes fussy, frustrated, and overtired (VERY unpleasant). However, until recently, it was possible to hand him off awake or asleep, so that mommy could get a nap. For the last couple of days though, he seems to wake up shortly after a hand-off and only want to be held by me...which wouldn't bother me except that I'm already holding him for upwards of 18 to 20 hours per day.. I think he is/was in the middle of a growth spurt and he often wants to nurse, but during these episodes mostly seems upset and primarily wanting to comfort nurse (DS is EBF, appears to be growing and developing normally…and when he's not screaming, he is mostly a very pleasant and happy guy).

Am I doing something wrong (somehow creating an infant will only be held by me)? Should I be trying a different strategy for naps-- mine and his?

So far I am holding up OK… but at times I am SO.TIRED. (getting about 4 hours of sleep daily, but spread out, for weeks)...

Thanks (in advance) for your thoughts and support!