I do want to note.
Scaling Demi-Gods to be equal to other Demi-Gods is a bit odd based solely on the fact they DemiGods, if memory serves, Godrick too was a DemiGod but is inherently actual dogshit, the lore around him is that he was actually, very, very, very weak and basically just a normal, old, brittle man. Despite the fact he was complete ass he still thought he had worth and was king shit of **** mountain due to his status despite being trash, thus, to gain power, he did that grafting shit to compensate.
His DemiGod status didn't save him from being literal fodder, he needed grafting to even come close.
Unironically everyone in this thread could probably beat his ass pre-grafting, that's how pathetic he was.
Ergo, I'm not so keen on scaling DemiGods to DemiGods without extra context, if DemiGods fight another or has the lore yeah cool, but being a DemiGod isn't an inherent path to power, it means nothing by itself. The shattering ending in a draw was a bit more complex than "they just couldnt beat each other", some of them didn't care, and some of them were satisfied with what they already had and some were actually fearful of the more powerful ones, and some were doing 4D chess and caused the shattering to begin with like Ranni. Only a few actually sought more or engaged in full on combat, obvious example being Mal and Radahn.
Tbh we should just scale based on feats and statements that we know for sure, the lore is convoluted enough as it is, we want to avoid assumptions.
Margit would scale tho, at least in the form of Morgott, given Margit is just him pretending and Margott is buff as ****, though he's 100% holding back as Margit, given you fight Margit twice and only once you hit the tree he's like "yeah ok **** this" and starts railing you.