Comment 108 for bug 1594023

So removing quiet splash and adding noefi to grub and editing

sudo xdg-open /etc/systemd/system.conf

removing the # infront of #DefaultTimeoutStopSec=90s and changing the timeout to 10s instead of 90s

Seem to have fixed my issue

I found the last bit here:

https://itsfoss.com/long-shutdown-linux/

Please comment and let me know if it solves it for you too.