I had a similar issue with my 12 string. In the end I swapped out the bridge for a Gotoh one. Never looked back.