Not sure if you read it yet. But go read the novel of Angel Beats
http://forums.animesuki.com/showthread.php?t=93416
Yuri is quite awesome indeed. And yeah she is really similar to Haruhi
Also your love triangle could be broken. If Yurippe ever fall to a guy, i say it will be Yurix Hitana. He's a quite good protagonist indeed. So far much better than Otonashi IMO