I would consider looking for a new job on the side and start interviewing. Your boss's boss showed you disrespect and personally I would have a hard time trusting that person if I were in your shoes. Don't start any drama at work on anything... just keep working doing what is expected but don't go above and beyond killing yourself, and start practicing for interviews and start applying at other places if you can.