I think a lot of baby steps here! WOO HOO! Just thought I'd point this out to you, because sometimes we are so close to our own sitch we don't see all the positives!
The way C said goodbye, odga, she loves you! She just doesn't want to hurt you, give C time and keep doing what works. You are now on an inswing, buddy! I'd say the friendship is back on!