Have you thought about using the both names, but the other way around? So instead if being Caitlin Joanna (which is the issue of being the same 1st name as your sister) you could swap it to Joanna Caitlin. So your bubba's middle name is the same as your sister's 1st name. Then you would not be calling your daughter by the same name as your sister, but still honoring both friends.