I’m kind of tempted to not try to break any habits until 5 months - thoughts?
You can be working on this in a gentle no-cry way now. It's just it won't be a magic wand with instant results. But with effort, you will have already made many improvements by the time baby is 5/6 months anyway.
So, for example, try to rock less vigorously. When baby is calm and not crying, slow and still the rocking so you are just holding baby still, but be willing to restart if needed . But always still the moment baby is calm and not crying.
Also, gradually put baby down earlier. So the aim (in the longer term) is that you rock baby while distressed, still once calm and as long as baby stays calm when still, you lower baby into the cot*. But if crying starts you roll back up the steps - so lift and hold, if that's not enough rock. Then roll back down the steps when calm - rock, still but held, lowered down to cot.
- Lowering into the cot is a technique to master in itself. It is not just a case of putting baby in the cot.
When putting baby down, a swaddle makes a big difference because it reduces stimulation. Holding baby to your chest (cradle hold), bend at the waist. The idea is that you and baby lower to the cot mattress, but with baby not moving relative to you. So baby stays held to your chest as you bend over the cot.
Get right until your torso is parallel to the cot mattress and baby is on the cot, gradually remove your arms from under baby but maintain the same physical closeness, so you are hovering over baby's full body with your chest touching, and arms still circling baby (but not under). Wait until baby is calm, then as you slowly lift your torso, replace it with the weight of your hand firmly on baby's chest - so the weight of your presence is replaced with your hand. Stand up slowly and keep your hand there for a few minutes, before slowly lifting hand.