I wonder if FTTP will go the same way though, as its a bit more problematic as you don't want end users unplugging the fibre willy nilly when dusting, etc.
I fully expect FTTP to remain a 2 box solution.
The ONT is wall mounted and fibre cable clipped to the wall/skirtings.
You should never need to unplug the fibre cable.
With an ISP switch you just change the router over to whatever hub that ISP providers.
For the more technical who use their own router a simple change of credentials is all that's required.
Due to the shared nature of PON networks OpenReach will probably want to keep control of what ONT's authenticate with their OLT's so I can't see ISP supplied ONT/Router combos ever being provided.