Yes, that's a fair point about Muay Thai. It certainly expands the range of effective techniques, and the ability to use knees and elbows at close range is devastating.
Krav Maga is very interesting, designed purely as a hand-to-hand combat system, with no pretence of being an 'art' or combat sport. I've no experience of it myself, but would also love to give it a go.