Hi there, my little guy went through... and still goes through the exact same thing, but what I'm finding is that if I just take him to bed and make the room completely dark and just lay him down unswaddled he will play and talk and wriggle for sometimes up to 45 minutes, but most times will then fall asleep.
Have you been holding your baby until totally asleep? I'm still having good and bad nights, but he used to fight like crazy and I've found letting him unwind in the dark on his own really helps. Sometimes he starts to cry and if he cries for longer than a few minutes I pick him up again, but more often than not, after the wriggles, sleep prevails!!
Tannis