A smaller front chainring may be the simpler upgrade. It would require shortening the existing chain whereas the larger cassette would require a new longer chain. 10/11sp chains greater than 118links are hard to find imho. You'll lose top end speed but hills are your thing so gear accordingly...