Upload Garmin workout for non s/b/r

I do a fair bit of crosstraining, mainly on the indoor rowing machine, or outside rowing, and I want to use the Garmin Connect function of logs so it neatly places it in the HR zones and I have a data file with graph on my logs. But I have to upload it as either swin, bike, or run in order to be able to upload a Garmin file and get all the HR data intact (or power data, when I can get the Concept2 to pair with the 310XT). I don't really mind, but it does skew my totals quite a bit.

Of course, maybe I am missing some very obvious option! If so, then help a newbie out.

I do like the logs a lot and they encourage me to keep them up to date and do my workouts.