It sounds like #2 is a Final Boss-like fight and #1 is an Extra boss-like fight. After all, some of the optional bosses present in some games are really stronger and harder than the final boss.