Hello Peter,
Well, you've picked a tough one to confirm as pre-45. There does not appear to be a consensus regarding the specific characteristics of a Third Reich original, as the same design was used post-45 in the Bundesmarine. The conventional wisdom on these is to let the badge's finish guide your originality opinion. Since both of the badges that you have posted appear to have a vintage look, you could probably choose either of them. In this case, originality is in the eye of the beholder.
For what it's worth, here is a scan of my badge, which resembles the second type that you have posted.
Erik