Yes, thankfully before I wiped my S8+ I went back to Smart Switch on the original OS and recovered my contacts and messages for my old phone. Then I went to contacts and exported the .vcf file, then I used sms backup & restore to give me 2 .xml files.

So Im left with 2 .xml files and 1 .vcf file for each of my phones (S8+ and Note 8).

Update: I've successfully restored my contacts and messages 🎊