Wish I had advice to offer. I have enough issues with one -- and then God saw fit to deposit the kitten literally at our doorstep last year.
Getting Ozzie and Toby the Cat (it's been a whole year already) to cohabitate relatively peacefully has been a chore. And there are still some nights that they both get into trouble.
Hope your hand feels better and that you get a good resolution!