Yeah, they usually can't go beyond that 3 hr schedule until their awake time lengthens, and that's different for every baby. When you notice that he can stay up a bit longer, then he is ready!
Sometimes babies need that swaddling, at least their lower half, until they are really crawling around their cribs. For this winter you could try a Halo Sleep Sack, not quite a swaddle but better for crawlers. My ds was a tummy sleeper because of reflux, he liked to be tucked in tight with his swaddling blankets and later loved his sleep sack. It makes them feel secure.
Most babies wean off that first night feed first. He is giving you a 5 hr stretch - not awesome but pretty darn good. It is probably hard for you because you don't go to bed until much later, right? We usually see babies start sleeping until 2 or so, and some will still wake at 6 and some sleep through until later.
I think it perfectly normal for breastfed babies to wake a time or two to eat at night! And it is hard to remember that he could be waking for other reasons - developmental or teething or tummyache - and realize he is hungry and gee nursing sounds like a great way to get back to sleep!
How old is you dd now?