L.M.
E.,
I don't know how you 'weaned' your son from the swaddle but we started with one arm in and one arm out. Then went to both arms out but still the swaddle around her stomach and finally not swaddle at all. You might want to swaddle your son for naps again for a few days while he catches up on his sleep and then try and wean him from the nap time swaddling slowly and see how it goes.
L. M