Mass Effect Needs More Star Trek: TNG

While watching Star Trek: TNG tonight, I realized that part of why I love the show so much is that very few of the confrontations Picard and the crew get in to are solved with combat.  There is some, for sure, but it is almost always used as a last resort.  

Don't get me wrong.  I love the combat of MEA.  The jump-pack makes things very fast and fun, and it's very well done.  However, I would like it if it weren't always the only option.  In ME1 there were several instances where, if you played your cards right, combat wasn't necessary.  The first part of the final fight with Saren, for instance.  Also, when entering the biotic compound with Father Kyle, I believe.  There were a few others IIRC.   

At any rate, I don't want future Mass Effects to be stealth games where like Dishonored or MGSV where combat can be avoided totally, because I do believe that no matter how you roleplay there are some instances where it will be necessary.  However, it would be great if there were, in more instances, cases where wits and imagination can help solve a problem rather than combat.  Combat can still be an option, for sure, but I think ingenuity in solutions would be very welcome.