I assume your DS is waking because he startles himself due to involuntary reflex babies have (they grow out of it). Have you considered doing the angel wrap? Your DS hands will be up near his face, so he can feel them & move them somewhat but should stop the startling a bit. Otherwise consider a gro bag or something similar.