Bingowings said:

RE : Lando and Han vocally patching things up.

If you trim a bit from his thanks to Luke Han could still claim to owe one to Luke (which I don't get because Han saved Luke twice so technically he's still owed one from Luke but I digress) and he could say, "Thanks for coming after me" to Lando, maybe splicing a mention of his name from elsewhere.

In an ideal situation Han would express his undying gratitude to Luke by shrugging it off but with both of them and the audience knowing what Han really means.

So ideally it would be "You still owe me one kid" and Luke would chuckle to himself.

In the sandstorm deleted scene, Han thanks Luke, and I think he says, "I owe you one." I agree with you, it'd probably more in character to say what you suggest, but as it is the more personal version of the exchange, I'd rather use it, and it might be hard to alter his lines in that case since we'd actually see his lips. Just my opinion. As for thanking Lando, I think that's perfect. Splicing Lando's name in there would be a simple solution to redirect the conversation. I think Lando should respond with something similar to the line in the script, something about bad luck if he let Han remain frozen.