I feel for you. Years ago, I tried. I honestly tried, and I came away with the realization that I do not want to be at the mercy of any organizational culture that is not of my own making. Self promotion, paper shuffling, ass kissing... all of that goes with the territory and I am not good at it. It sounds like you have a solid plan. Good luck.