xyzulu We had that same delay as well, for us it was being caused by the srs_milter service so to fix it we added an TimeoutStopSec overide like this to every server
systemctl edit --full srs_milter.service
And then add "TimeoutStopSec=15" to the [service] section
After that the reboots were almost instant 👍