Pool swim merge: How to keep moving time and sTSS in TrainingPeaks?

[Tinu]

Hi everybody
I am trying to merge two FIT files from a pool swim session:
File 1: Polar Verity Sense (Heart Rate stream only)
File 2: WorkOutDoors on Apple Watch (Swim metrics: laps, distance, pace)
My goal is to get a single FIT file for TrainingPeaks that includes my Polar heart rate data while keeping the clean swim data from WorkOutDoors.
The Problem:
When I upload the merged file to TrainingPeaks, it shows the total elapsed time (including rest intervals at the pool wall) instead of the moving time. Because of this, TrainingPeaks calculates hrTSS or tTSS instead of sTSS, making my TSS score incorrect.
My Questions:
Which settings should I use in GOTOES so that the rest intervals are ignored and only the net moving time is used for the workout summary?
How can I make sure TrainingPeaks recognizes the swim laps correctly to calculate sTSS?
I have attached both original FIT files to this post.
Thanks a lot for your help!
Best regards,
Tinu