1. I can't answer you specifically on this because it seems like there is no clear cut answer. Personally, I like green tea so I drink it!
2. I *do* count the green tea as daily water intake. I found these wonderful Lipton green tea individual packs that you put in 16.9 ounce bottles of water and just shake. They have honey & lemon and mandarine & mango. It's really the only way that I can get my daily water.........the only time I like plain ice water is right after a good, hard workout!