ETQW is my game of choice at the moment. It, too, suffers from some of my same complaints, but since it was more a sequel to W:ET than Quake, I can dig it.
I stopped playing TF2 almost dead on once they removed friendly fire. The game was too spammy for me with it off.