Yeah that sounds good.

I know he wasn't. :) he fought through it, challenged the alpha, and won.

So what should happen next? Time skip to when Toothless and Aurora leave for the season? Or when they come back? Or would Hiccup and Castiel go to the grounds to check up on them(maybe the egg process for furies could be longer than the other dragons)?
Also when Aurora gets captured should she already have her little baby furies with her or should she be just about ready to lay her eggs?