Yes, which is why he granted Homura her wish in the first place since a dead Madoka had no use for him.
I don't think that's why, more that KB was jumping at the chance to make another contract. If anything, Homura's with to "redo their meeting" could result in Madoka never forming a contract in the first place.