Did you consider the one from Unicomp?
I also have a Unicomp New Model M which is a pretty nice keyboard as well. Wish they made the housings in grey instead of black though.
Reply on news.ycombinator.com