Glad that you got it to work @wammes
Sorry, yes, that was a bit oblique.
I meant that you should try adding x.systemd-automount as an option for the drives in /etc/fstab, use that instead of nofail and systemd should handle them automagically.
Anyway, sorry for the off-topic diversion.
EDIT: ah, you figured it out, just read your later post, good stuff.