I would go with option D. Go in before the graduation, tell them that you feel like there was a misunderstanding and that you would like to resolve it. Tell them that you do not feel your issues were sufficiently addressed and that because you think you provided more support than you received, you'd like to continue this process -- what you wrote in your post was really good information and there's no reason not to share it with them.