Finally had the talk with my Boss I had been dreading to have. Things came to a head when on Saturday his text woke me and continued until the evening. It was the last straw.
I came prepared but was more emotional than I wanted to be. I really thought I would not have a job anymore, much to my surprise we were able to come to an amicable agreement.
I hope he keeps his word but I am still going to be open to other opportunities.