Swimming with Apple Watch- native app vs Swim.com

I love intervals.icu and now don’t know if I can do without it. I’ve been cycling almost exclusively for the last 6 years but a muscle tear has forced me back into the swimming pool last week. Using the native AppleWatch swimming app has given me great data in intervals.icu but it has a couple of issues. 1) no drill mode (and I would really like credit for kicking, one-arm drills etc.) and 2) the Strava file doesn’t parse the rest periods correctly. Today, I decided to record my swim intervals with the Swim.com app on my watch which has a drill mode. The integration with Strava looks great, but all attempts to get the swim into intervals.icu are a disaster. Downloading the .fit file from Strava- bad. Downloading the .fit file from swim.com- worse. Using Healthfit as a bridge for the .fit file- absolute disaster. Does anyone have any ideas on getting swim.com to work properly with intervals.icu?? Thanks