I am not opposing your recommendation; but I'm curious: did you have any of these conditions in mind for the service? The early-init maybe?
Best would be to just keep it as is. One of the reasons to keep haveged as mentioned in haveged readme: > want to deploy an additional entropy source.
