Forgotten Title [Resolved]Sword Master's Descendant (unclear if mistaken for or really true)

So there is a series I am thinking of, an LN which I first found through its manga adaptation, but its name just keeps slipping my mind. I scrolled through my reading list, but I just couldn't recall it, so I'm going to list some details I remember:

Spoiler

- MC is a spitting of a famous Sword using hero, but is teased because he is inept
- He runs errands for his upperclassman, who hides her identity as an angel who was in the hero's party
- A dragon princess is released from some seal and comes to visit the angel, and they set off to find some diary (I think it had a special name, but it slips my mind...)
- They meet the past demon queen, who I believe also reincarnated
- They take the MC along in the party and confront some OP demon
- MC learns to summon a salamander through some special method

 

Sekai no Owari no Encore.

 

Thanks!