The scenario we described above is
mild on the bedtime - tantrum spectrum, believe it or not; sometimes bedtime avoidance goes as far as kicking, pinching, biting, and slapping.
Once the swaddle went away (six months) we focused
on some
mild sleep training (mini-fuss-it-out, basically) and eventually I could just put him in his crib awake at
bedtime and naptime and he'd figure the whole «lie down and sleep» thing himself.