Beautiful work! And it seems to be a pretty extensive research you've conducted. My compliments and respect.
One little thing: I thought the class goes first in the title and then the ship name. Please correct me if I'm wrong.
Thank you.
I am sure that the class goes first with all capital letters in the file name but I haven't seen a single "standard" on the drawings.
personally I add also the years and reamains no space on the first line.
Moreover I like to add all the ships of the class on the head of the class.