Hugs Banana, that sounds very stressful.
Edelweiss, you are super mom! I don't know how you do it.
Cardigan, I think encouraging wakefulness after 2 hours of napping will help him make the shift. Turn on the light, turn off white noise (if you use it), make loud noises around him, turn off the vibrate on the bouncy chair, undo the swaddle.
At night, keep it as dim as possible, swaddle well, and use white noise.
And, as with any sleep changes, try it out...