I still nurse him before bed, but he's starting hopping up after nursing sometimes and running around like... well, a two year old. He'll then pick a parent and go to sleep. Sometimes with a back rub, sometimes at random. Seems to be teaching himself to go to sleep differently.
Until June, he still took all his naps on my lap, so we've switched that up, too, with a mind towards the future and the baby. So many things!!