We desperately need this feature as well. Commenting so I can be updated regarding the status of this idea.
Will also try editing the suggested code to see if anything can work.
Another possible idea woud be for HubSpot to publish an article on how to track without the redirect? Obviously it will vary case to case but at least a framework would be helpful.