Yes.
Old habits die hard.
Tell him - if there's no hope left for us, please don't call me 'baby'. And if I say "I love you" don't answer the same, tell me to not say it."
if you really want to move on, that's what you have to do.
If you want to prolong the agony, make yourself suffer and hope in vain, feel confused, stressed and in limbo - just go on the way you're doing.
That way, it will take you years, not months to get over it.
If you
want to be hurting that long, that is.