You have a point. So, just to even and distinguish it out, if Merry is going to be genderly confused why don't we just make Legolas a trans-gender blonde bombshell with career dreams as a glam rocker...
Sound good?

It will get rid of any confusion for the reader on their part...
~ Studio Ka~