Google Ads Auto-tagging dropping conversion tracking with Pardot custom redirects

I am enabling custom redirects on our Google Ads campaigns so that we can track clicks and conversions (first touch and multi-touch) using Connected Campaigns. However, conversions are no longer getting tracked. As I understand it, this has to do with the fact that google cannot detect the auto-tags it normally uses, because the Pardot custom redirect that we have on the Google Ad as the destination URL drops the Gclid parameters as a third-party tool. I am able to get the Campaign name to appear in Analytics attribution through UTM parameters set up on the custom redirect to track in Analytics, but it "splits" the clicks to be attributed to the auto-tagged ads but then allocates the conversions and users/sessions to (not set) - see the evidence in the screenshot for this - you'll see that the clicks data is attributed to the "auto" Ad campaigns (with the Ads icon next to it) but that the (not set) Campaign has 17 conversions. For context, we have our Conversion goals set up in Analytics as if a conversion thank you page gets visited ( e.g. url contains /thank-you ) and the pardot form redirects to that thank you page upon successful submission. We have Conversion Linker set up in Tag Manager as well, and our global site tag fires on every page, as does our Pardot tracking code. I have also made sure to put the Final URL suffix that Pardot generates in the google ad link tracking parameters, so I can see the clicks in Prospect Activities - it is recording that cookied data that far at least, but somehow it seems that because the redirect is a third-party tool it is not reporting the conversion back to Analytics to attribute to the right Ad Campaign. Everything was working as intended until these Pardot Custom Redirects were implemented. The only solution I can think of is to perform manual tracking by generating a manual bit of code that sets a UTM parameter with Google Ad Campaign ID into the Thank You Code part of the form, but I'm not even sure that will work, and I would much prefer something out of the box and not hard-code something. Any one else encounter this and what is your solution? 

#Pardot B2b Marketing Automation