"Any recommendations for excellent tea shops (mainly Green tea/Oolong tea)? "

There is a nice and cozy tea shop owned and run by a Taiwanese lady where my friend took me. It is actually right by Raffles Hotel. According to my friend, lots of VIPs are the customers. I can check with her to get the exact address and name if you want.