I suggest you may deliver a generic ADMX/ADML template
You delivered a non-generic ADMX/ADML template with the necessity to manually add non-generic information like the tenant id and OneDrive Folder Default path.
This breaks up with the design principle of a template, which has to be generic. The non-generic Information is added via gpedit.
If you have a look at the policy "Site to Zone Assignment List" within inetres.admx, you can see that it is possible since Vista to create templates, where you then are able to insert the non-generic Information with gpedit and thus the policy creates the Sub key structure within the registry.
They thought about it and it's done. thx for voting.
A while ago, I discussed my Suggestion in a conf call with the Product Group. So hopefully, they "think about it".