strava-garmin-file-mergers merge Wahoo/Garmin files (preferably TCX) together, but it takes some hard work.