While not required, you could install Chan-SCCP-B to manage these two phones (back in Skinny mode) and make the BLF functions work without having to patch Asterisk. The rest of the phones in the network can be on Chan-SIP/PJ-SIP.
I don’t know if it will solve your problem, but the channel driver is written for these CUCM phones.