Help with sleep!

My little boy is 5 and a half months old. Our two problems are short naps, and night wakes. 1. Short naps - I know this can be part of the 4 month regression when sleep cycles change, but his naps have always been 30-40 minutes even before 4 months. Sometimes if I pick him up as soon as he wakes he'll go straight back to sleep, but I usually can't put him back in the crib. I've tried leaving him to see if he goes back to sleep on his own, but he doesn't. His wake windows are between 2 and 3 hours and he has 3 naps a day but because of the short naps this sometimes means a very long wake window before bed, but not enough time to squeeze a 4th nap in. 2. Night wakes - he goes to bed around 7-7.30. We feed and change nappy between 10 and 11. He didn't always wake for this pre-regression and we sometimes had to wake him but now he always wakes first. Pre-regression he was having on average one wake in the night to feed. Now he wakes more often, sometimes every hour. He always woken up around 5am, and the only way to get him back to sleep is by putting him in bed with me. He'll then sleep until about 7. We have to rock him to sleep currently and occasionally i'll have to breastfeed to settle him. Pre-regression I had a couple of successful goes at putting him down drowsy and him falling asleep in the crib with my hand on him, but now he won't do it at all. I've very briefly tried pick up put down, but he got too worked up. I'm now considering persevering with pick up put down, or trying the Ferber method. But I find it so hard when he cries and ends up just picking him up! Sometimes he'll even cry when he's being rocked to sleep and only the happy song will calm him. But I don't want to become reliant on a song 😂 I know this is long and rambly but I just feel so lost with it all. I keep thinking the regression will end soon and he'll go back to how he was but the longer it goes on the more I think I need to actually try and sleep train as it doesn't seem like things will get better on their own!