I thought EDTA was calculated using total batch weight. That's what my notes say and I just double checked DeeAnna's website, where she says total batch weight as well.
https://classicbells.com/soap/EDTA.html
So based on that, I believe your second calculation is the correct one.
https://classicbells.com/soap/EDTA.html
So based on that, I believe your second calculation is the correct one.