OK, now we’re getting somewhere.
I updated the db to have service correctly spelt, and re-booted. Yeah, yet again the shutdown stalled after showing: [OK] Reached target Shutdown.
Now smb shows up in Services 
, but in Network Services:
A quick edit to switch it to ‘Green’ and away we go:
Now the question is, where is my home directory, as that is also supposed to be available.
EDIT Fixed. I needed to sign in to one of the shares, and then magically my home directory appeared.
Cheers.