"At this point, we're stuck with all of git's quirks, until something new comes along that's significantly better in enough fundamental ways to displace it."
No, that won't be enough. You need something that's better than git in the same way git is better than SVN: A paradigm shift. Merely being nicer or easier at doing the same thing is rarely enough, you need to do something broadly useful the entrenched tool just cannot do.