Yeah, what I do is to carry the Wave - mostly for the saw, which I seem to use a lot. I keep paracord in my pocket, because I no longer use the original pouch that the Ritter Kit came in. I use two steel water bottles and a sierra cup is always hanging somewhere - from the belt pouch or my belt, or it's in the lumbar pack.

The Trailmaster sounds like a more efficient way to have a knife and saw, but I always have both the folder and the Wave on me, anyway, because I use the Wave at work a lot. If I had a new Wave, with the better blades, I might not carry the knife at all as EDC.