Now for the weird thing… for S&G, I disabled and re-enabled the OSPF instance, and the routes propagated as expected.
Now, I can understand restarting OSPF… to a point. That point, is that the change from broadcast to nmba was made on both routers, but I only had to restart one of them.