I am not aware of any ideas how to fix this that don't require some intermediate custody of funds

The only way to do this with the tech as it is, is to do an independent zap per forward in the background ... basically it'd require its own paid action and its own special retry logic.