In the old days, I would have recommended the Kansai area Pass but for your stay, the above-mentioned ICOCA + Hauka round trip package may be the best bet.
Yes, the ICOCA is good for the Kyoto subway and bus.
http://www.westjr.co.jp/global/en/tr.../icoca-haruka/