After doing a full update a few days ago the issue stopped.
The sytemd-analize output is now
4.474s (firmware) + 3.532s (loader) + 1.217s (kernel) + 1.799s (initrd) + 3.328s (userspace) = 14.352s
Thanks to everyone who tried to help. I’ll be closing the thread now.