Of course, it's great for others to be able to ride headliners twice.

Certainly the adults are interested in a couple of those. Our main question now is, do we have to expect that Baby Swap is going to be a big part of our day at DHS? Seems like so much of what we expected to enjoy at Disney parks with grandkids is currently closed... the shows, character meets, parades, and fireworks. Little Guy is barely 31" so there doesn't seem to be that much for us to all do together. Especially when you consider value for admission price.
When we visit
Disney, we are really most interested in shared experiences as a family, together with our littlest ones, all ages. Really, for us, that's a primary reason that we would choose a Disney park vs. other theme and amusement parks. Since this visit to DHS with Little Guy is the first that we're making with any of our 7 grandkids (all between ages 3 months and 4 years), how it goes will influence our decisions about several near-future visits as well.
We've enjoyed resort vacations, zoos, aquariums, beaches, children's museums, etc., with our various grandkids. While they may be too young to remember later, we've loved seeing each of them experience new things. But a Disney trip is $$$, more than other competing theme parks. If enjoying a day there with our grandkid(s) means a fair amount of time in Baby Swap waiting areas..., not worth the higher cost, IMO.
Has the Baby Swap process changed, in light of the loss of so much kid-friendly entertainment? Is it any better than waiting around on a bench in a waiting area near rider exits, with nothing for littler kids to do?