First, I would advise to talk to an employment or HR counsellor outside of your workplace to get another viewpoint on the problem. Perhaps somebody not directly involved in the problem or the organization could put a better spin on things. They might be able to advise you of ways to address your boss without tension or anxiety on either end.