Your cite is itself incorrect - or more precisely, it’s confused. It refers to women in “non-combatant” jobs in WWII. Lynch is an actual full-time professional soldier, which is different - WACS and WAVES and the like in WWII wouldn’t have done what Lynch does. “Non-combatant” is not the same as a non-combat trade. A “non-combatant” is a legal and moral concept meaning people who are not legitimate targets of military force - civilians, POWs, the injured, shipwrecked sailors, and airmen baling from stricken aircraft are all noncombatants, or hors de combat. Lynch was, unquestionably, a combatant, by the laws of war; she was a uniformed soldier in a battle area, carrying a personal weapon, and the Iraqis were legally entitled to attack her. Once she was incapacitated and chose to surrender - I think we can agree two broken legs is a pretty fair degree of incapacitation - she became a noncombatant, of course.
It is true that Lynch doesn’t serve in a combat trade - she was in a maintenance unit - but that’s a difference in your role, not in your being a soldier. Actual soldiers can be roughly put into three groups:
Combat roles (Infantry, commandos, armor, recce, Marines, paratroopers)
Combat support roles (Artillery, antiaircraft, air assets, communications, intelligence, MPs, electronic warfare)
Service support roles (Maintenance, transport, medical, supply, etc.)
Lynch is Group #3, I would presume. (I was Group #2.) However, she’s still a SOLDIER, trained at at least a basic level to fight and carry weapons and such. Everyone in the Army is a soldier first and their specific role second.
As to her heroism, I strongly suspect the reports of Lynch singlehandedly mowing down hordes of Iraqi soldiers are BS. I can certainly believe she probably emptied her magazine - you may as well - but given the number of stories we’ve later learned were magnified 100 times by the initial excitement, it’s safe to say this likely was, too. Even if she did plug some poor bastard, it’s not as if you can even tell who’s getting hit by who in a wild firefight.
But, hey, she’s a soldier. She did her duty and got badly injured doing it. She gets a Purple Heart, at least.