4 mo. wakeful + growth spurt + am I messing up his routine + yikes.

Little guy is 4 mo on Monday.. since he turned 3 mo we have been using the Halo swaddle me and he's been sleeping in his crib, he transitioned nicely out of the RNP in our room. He was sleeping 4-5 hour stretches and waking for feedings, I EBF so I'd leave my bed and go into his nursery and feed him in a chair, then back in the crib.

Well the past week he's been eating every two hours, but it seems the nights were okay. In the past week he's learned how to roll, so no more swaddling... he seems to handle it OK for naps but not at night. Also now he's eating every two hours at night. 

So, I caved and the past two nights we're camped out in the guest bed, so I can just turn and feed him and we can both get back to sleep. He is really flailing a lot without the swaddle. I can help calm him too when I'm right there next to him.

Am I being selfish? Should I keep the crib routine going on even though I will be a zombie waking, walking to his room, getting him out of the crib, putting him back, freaking out that he'll roll himself into the side of the crib, dealing with how ticked off he is unswaddled? etc.

Or is it OK to take this break while he's eating so much? 

Thanks for any advice!