First up, thank you for the update.
This is the third romance-manga-with-a-gender-nonconforming-female-main-character that introduced a (potential) rival, and as always, I am scared.
One of the three did not handle that arc good, and ended even worse shortly after.
The other introduced the arc only recently, and I am a bit more optimistic, but sceptical.
And here I am not all that afraid, but I am not looking forward to slogging throug the incoming misunderstandings and arguments.
Alas, at least one romance-manga-with-a-gender-nonconforming-female-main-character is pretty much immune to that trope