I am in very similiar position right now, and I have decided to bite the bullet and drop all non individual contributor responsibilities. I'm not yet sure how it will go but it's my #1 priority to arrange it with Cxx. I know this was supposed to feel like "step up" but it's not who I am. I don't aspire to great managers, I respect people like Carmack. I want to be the best and most productive engineer, that's where I have most fun. If the money is similiar, that's what it's about.