Couple of hours all told - but these are complex setups and the migration always loses things - sometimes big things and sometimes little things, but always a different box than when you started.
FYI - something else I noticed this morning - the realtime database had to be reset like here:
fwconsole util resetastdb
and also the SIP settings page was defaulted - had to fix that too!