If you're going to make p2p home runs, just do it. Support the equipment in the first place at the CO to make that possible, rather than installing splitters then ripping out those splitters, patching things back up. Remove the intermediate cabinets. At that point you may as well just provide raw ethernet. What was the point of the PON nonsense then?
PON is a stop-gap technology that's outlived its usefulness, if it ever was there before. It's a crutch and should be retired.