Accidentally changing classes during death/map screen.

I played a lot of the beta and didn't have any issue. But in the final release of Battlefield 6 there is now a way to change your class using the E and Q keys (left and right)

I am an ESDF player. I edit all my keys so instead of WASD I use ESDF where E is forward.  My use is on my mouse thumb button (I believe Mouse 4).  I tend to use that as use in every video game where I can. And I use ESDF where I can.  

I keep accidentally hitting E and changing Class. I'm not sure exactly how this is happening. It could be that just as I'm loading in I'm pressing E to run and its changing right before I respawn in.  It could be right after I die. It could be a habit with my hands on the keys. The habit is very hard to break.

My 3 friends in my squad are WASD stock key players and they said they have done it too, just not nearly as much as I have.

This is highly frustrating!  I would really like it if

1. It was removed entirely
2. Change it so its something that can be changed in the key menus, perhaps the UI key editing so I can make it something else.
3. Make it so its not just W and E (or may be its Q and E) and change it to USE and Spot. Whatever those keys normally represent, get changed when changed natively.

Thanks.  I really hope this message gets to somebody at EA/Dice.  I can't be alone here.  I'm (and I think many people) are totally fine just clicking to change classes, or setting up keys they see fit.