In the 350cc space, bikes like the Royal Enfield Hunter / Classic / Bullet 350 and Honda CB350 trio make for good options considering your mixed usage. All of them have upright ergonomics, comfortable suspension setups and decent fuel economy.
If you are open to waiting for a few months, Bajaj will be releasing 350cc versions of all the Triumph 400cc bikes. These will offer you noticeably more performance than the aforementioned air-cooled 350s while being priced similarly.