How to encourage better sleep & naps

My baby is 3 months old and I’m currently struggling with how to get him to sleep more and better.

Daytime naps are very difficult. He always wakes up around the 25 minute mark and sometimes I have to pick him up and rock him back to sleep and maybe we’ll get another 20 or 30 minutes. However, this doesn’t always work. I’ve tried soothing him without picking him up, but that doesn’t work during the day.

His wake windows are anywhere from 70 to 90 minutes. Unfortunately, it takes a good 45 to feed him because I am combo feeding both with breast and a bottle of formula. The rest of the time during his wake window is filled with independent play, tummy time, and interaction with me.

Nighttime has varied, but usually we put him down around 9 or 930 and he used to sleep through the night. Now he wakes up periodically and I put the pacifier back in his mouth and I try not to pick him up. We have a Snoo but honestly, I feel like it isn’t doing too much anymore to help him go back to sleep without my intervention.

Yesterday, we put him down by 8:30 and he starts waking up around that 30 minute mark, but I put the pacifier back in and try to soothe him which worked. However, I had to do it one or two other times at night and I’m not sure if it’s because his hands are Swaddled and he can’t self soothe or what. He also has started leg slamming I think to try to soothe himself.

I guess I’m not quite sure what to do and I’m looking for some advice .