I'd say start looking for other work now. Don't necessarily quit until you have something else lined up, but with a reference from the good boss, you should be able to find something readily enough.
This is my signature. It exists to keep people from skipping the last line of my posts.