Hi there, welcome to the boards!
Well this is prime age for dummies and swaddles to start to become a problem so you may as well get rid of them and will probably see sleep improve. The main thing is that you'll be teaching him to go to sleep independently, and that will stand you in good stead.
So you've got rid of the swaddle now, I would just keep him in his sleeping bag for naps and at nights. Yes it will be a tough few days/nights while he gets used to it, but he will adapt. This is a great time to introduce a lovey as it will give him something to do with his hands and a way to soothe himself. Tuck the lovey between you two at feed times and encourage him to grab it. While he is settling to sleep you may have to physically hold his hands onto it for the first few days until he gets the hang of it.
Getting rid of the dummy at the same time makes sense, because even if you weren't going to, without the swaddle he would likely knock the dummy out of his mouth anyway. You can do PUPD to settle him, but there is no point doing PUPD for a while and then saying 'oh this isn't working' and giving the dummy back. That doesn't achieve anything. You ahve to be prepared to get rid of the dummies entirely.
So starting with first nap tomorrow, you will do his nap routine, put him in his sleeping bag, lie him in his cot, and then do PUPD when he starts to cry. Be sure it is a fully on cry not a mantra cry. Do it for 45 mins, and after that time if he is still showing no sign of settling then abandon the nap, do a reduced next A time, and try again using PUPD at his next nap (which is brought earlier). Be prepared that he may skip one, two, or even ALL of his naps the first day. That's OK. Stay with it. At bedtime, you keep going with PUPD without a break until he goes to sleep. The next day will be easier.
The dreamfeed is up to you. Some babies it disturbs their sleep more, so if you try it for a few nights and find he is still waking the same, you might prefer to just let him wake naturally.
I'd still expect him to need at least one feed maybe two overnight at this age.