I like the cleaner approach itaut, but I don't see the need for the roaming.pb.
I understood this file purpose was to take for instance, the local copy of data and merge the bookmark/history etc into a single roaming.pb file, which is what you would need to capture with DEM or roaming profiles.
But since you are calling the files separetly in the DEM include config, it's not needed. At least for me, I don't use it and all custom settings comes with DEM.