Niether name you mentioned is correct. I see that you too have done your studies. But I want to add this for you to understand. I use the manuscripts and in the book of Esther the real name is there hidden and locked in because God knew man and what they were going to do. I point out these scriptures and lets see if you can pick up on the real name.
Esther.
1:20
5:4 and 5:13
6:5 and 6:7
They are given in a acrostic so you might not see it. But thanks for sharing what you have learned. Your right on the button on how it got changed. But not YHWH. Its YHVH.Peace.