Well, whatever is going on on those two deck levels (I'm no USN expert either btw), it appears in this photo that the two levels are very similar in layout, whereas your drawing has two quite different setups:
Also, the 'windows' on the funnel appear to be rounded, and not quite as tall. I would maybe do 3 x 4 pixels with rounded corners.