Yeah I have picked up on that already.

I have a Gondor custom somewhere...

I would definitely switch out the arms for the style in your picture there, but again, in silver.
I think I already looked at the helm style in the picture too and decided to go with the barbuta helm,
But if the dwarves are using the barbuta style helm
I think I would switch Gondor's helmsto the one in your photo.