Great report, really good to hear on the battery life. I have similar use case to you. Email, Office Suite, browsing, etc. Although I do want to do some light photo and video editing and beginner programming in near future. Question: What brightness did you have it at throughout the day?
I also moved from i5 256GB to i7 256GB and also agree that i5 is the sweet spot. Like you, the extra money meant very little to me and because of a particular deal I got, I paid only about $125 more so figured why not. Had just been promoted at work and won $5,000 in a contest in the same week. However, for anyone on a budget or just doesn't need to have the latest and greatest, and isn't doing intensive things, the i5 seems like the way to go.