Hi all. My LO was a cat napper as well, but grew out of it naturally. I tried doing the wake to sleep, didn't work, but it may for you.
I think a big thing is getting the A time right. I think monkey_cat has experienced the same thing I have. If A time is too short, 40 min nap, if it's too long, she's OT and only sleeps about 30 min. It's all trial and error!
If your LO is wriggling out of the swaddle every time, then it may be time to get him hands free! I found that once my LO was out, she was able to suck her hand and soothe herself. We had a couple of rough days/nights because she wasn't used to it, but after those two days, she was much happier with her arms out.
I found that after about 4 mts, the shhh/pat method had the opposite effect and made her angry.
As for your baby "seeing you and waking up more" bluegreenorange: the trick is to not make eye contact. If you make eye contact, this engages them and causes stimulation, which will make them more alert. I've read so many books I can't remember where I read this, but I wrote it down and it made total sense. Go in to reassure your LO that you are there, and do the shh/pat if that works for your LO, but don't make eye contact.
Hope this helps! **hugs!**