Maybe it's because I watched the anime a few years ago now, but I swear Tamaki is more annoying in the manga (and he was really the worst part of the anime). He's already attracted to Haruhi, his fixation on her dressing like a girl instead of a boy seems like a "No homo!" situation. It's a bit icky to disregard her feelings, either way.