Soldier is an Army specific term. Like Sailor, Airman, Marine, etc.

Perhaps the term you are looking for is service member?

Warfighter tends to refer to anyone involved in a role that directly supports combat operations, it may or may not be a service member.