Try some longer rides with your current setup so you can have a better idea of where you need to make changes. I spend hours dicking around with gearing calculators but I'm fine with my current hybrid setup on 100k rides... 11-32 with a 52-39 up front. I'm going to try and do some randonneuring on my bike, and when I swap out my cassette I'm going to get a
12-36 29er cassette so I can get some lower bailout gears. Starting over I'd get a compact double too. I did set the bike up with a long-cage deore so I could run the bigger cassettes.