I was leaning towards a knife for edc (presently, thats what i do - carry a KISS), and a multitool in the bag, but if I can have everything in one, then i'd go that route.
I EDC a KISS as well, it works great in it's secondary function as a money clip. And also like you, I work in an office environment and keep my multi-tool in my bag. I've looked as a variety of multi-tool options and the closest I've come to finding one for constant pocket carry has been the Leatherman Squirt but I'd perfer pliars to scissors.
Please let me know what you decide on and how it works out for you.