Sounding like nothing better than hybrid module of both. We do this already for a number of modules unfortunately -

puppet+justin8-systemd

for instance. Deprecating the old interface with OS.