Definitely you can extend your H-1 to seven years, in this or future position. Since you will yun out your H-1 soon, you may need to get another type of visa like O-1.
As you already offended your boss, be prepared someday he/she asks you to leave right away once he/she find a replacement. If you can find another position, that's the best way out!