I think you're doing the smart thing, by shopping around for another job. You just never know what's going to happen when a new manager comes in.

I already know who I'm getting rid of when they promote me at work, lol

Good luck!!