my advice for avoiding the wanting gunplay would be to invest in the martial arts skill. initially you're not proficient, getting blocked etc. but once you upgrade to i think about 50 strike damage you can dispatch an enemy without difficulty in about three seconds. i loved the feel of the melee, especially as an alternative to subpar gunplay. also essential for non-lethal play obviously, if that's your style. for the stealth skill, evasion will give you a second chance upon being spotted, and of course shadow operative will cloak you entirely for its duration.
it has its shortcomings but the story/conversation aspect is great and for me playing stealth/melee made the minute-to-minute gameplay great fun.
Thanks for the advice! I guess I am going for a non-lethal play as much as possible, of course I can be prone to just shooting everything in sight when things go awry. But since the stealth element is much more solid, I'll start putting more points in the martial arts skill as well when possible.