I like this approach. Will give it a try first and then try the FitFile thing recommended by you and the other poster 
Just to clarify: I record it as “Bike Indoor” on my Garmin, do NOT let Zwift upload to Garmin and instead add the elevation & distance data that I see on the end screen on Zwift and upload a Screenshot to that workout, thats it. Did I get that right?