Hi there
I'm no expert but I experienced a similar situation when my lo was 8 weeks old.
She would take 1/2 hr to feed and then 15mins later I'd see the yawn, so I'd start the wind down process and put her to bed then to ensure she didn't get overtired. If she didn't stay asleep till the next feed cycle, I'd give her some quiet activity time until the next feed. And during that quiet activity time, if she started yawing again, I'd try to put her to bed again to get a little more sleep before the next feed.
my lo also hated being swaddled, and even does so now... she will fight the swaddling but then calms down as we are doing our wind down process. I personally find that she sleeps much better being swaddled. The times where she gets her arms out of her swaddle, they move around too much and she gets distracted by them!
With the short naps, you may want to check out some of the previous posts and stickys in the nap section, there's a whole heap of useful tips and techniques there.
HTH and good luck!