swaddle and baby sleep

Rachael
My son just turned 4 months, and he is constantly breaking out of his swaddle and it's making him not sleep very long. I've tired the one arm out trick but hit Moro reflex is still too strong and he gets upset and rubs his face.
Any tips or tricks to getting ride of the swaddle and heaping my son sleep more than 4 hours at a time?? 
Thank you!