We will be going to Braintree in a couple of months. Good to know about this issue now as we have similar issues come up. I hope Braintree and Shopify find a solution!
I have a similar issue and would also like to know what the options are. Scouring the Internet has not provided me with answers. Does Shopify review these issues?