I hope CPT creation gets into core! But at least more template control in FSE will be exactly what we need next from that side.