I done a migration a couple years ago and i still have the powershell script i used. Basically, use the eDiscorvery, download all users mailboxes as separate psts. run my powershell script which will move the folders in the pst around to make them look like a proper mailbox. Reupload them to the new tenant and away you go.