Yeah, I agree this is an issue at the moment. I'm planning to balance it using both the things you mentioned plus some other changes and features I have in mind. I really want to keep mindless and unavoidable grinding as low as possible in this game
