Samsung S8 International (Canada) Data Roaming issues

I have a Samsung S8 and I've been to Canada twice in the last 2 weeks and both trips I have had issues with Data Roaming when landing in Canada. On the first trip, when I landed in Canada I had zero roaming service (Voice and Data), so I chatted with support via my labtop in the airport and they had to "re-enable the feature" - not sure what feature that is since they said that International Voice/Data Roaming for Canada was enabled by default. That worked for a few days but then on the last day of my trip, I lost data roaming while in the Uber back to the airport. On the second trip, when I landed in Canada, I had voice roaming but no data roaming. I chatted support in the airport on my labtop again and they could not get it to work for the hour I was on the line with them (multiple "re-enabling features, phone restarts, reset network settings, etc...). I hopped on my connection flight and landed in my final Canadian destination and then it was working. After the first day of the trip, the data roaming dropped off again (I still had voice) and I just relied on Wifi the rest of the trip. Has anyone else experienced the same issues as me? If so, was your issue resolved fully and how? I don't have any confidence that the Xfinity Mobile support team fully resolved my issue. I will be traveling to Canada and other international countries quite a bit in the next year and will switch carriers if Xfinity can't fully resolve this issue.