Good that you try and make it !

However, win a battle doesn't mean you will win the war.

In view of your boss's character, including your big boss,I still suggest you look for outside opportunities. They treat you nicely, it is because now they need you most to stabilize the team.

But after the transition, things may change unless you are able to sustain your "unique" value to the bosses.

If your boss is a person with vision and management skill, a lot things should not have happened in the first place.

My point of view is, no matter of small or big company, boss is most important. Normally in big company, you getting a good boss, chances are much higher than the small one.