Ask 10 people for travel advice, and you'll get 10 different answers. All correct, all different.
So here's number 11
The advice on shrine/temple fatigue is very true. To me, the best way to avoid the fatigue is to limit to 1 or 2 per day, and also try to learn a decent amount about each one. That way, each one becomes more special.
Personally, I would not skip Kamakura, and cut back on other places. I think Kamakura had a peacefulness that was lacking other places, even Kyoto.
I like your Kyoto plans. Very easy to do in three days. Both Nijo and Kinkakuji are quite quick; Nijo, as I recall, has a set tour you must take, so you're in and our in about an hour. Kinkakuji is also quite quick, about an hour. You go, are totally impressed by the gaudiness of the Golden Pavilion, and then stroll through the rest pretty quickly. My only suggestion would be to add a couple of places with nice gardens. Also, in Kyoto, if you find you are getting "Templed out" you might want to consider Nara. Go and pet/feed the deer, and there is a lovely garden there as well.