To be honest I prefer the original version as I don’t think you would be penalised for using the word custom ‘twice’ (unless you said Hopson Custom twice in the same sentence).
However I think the h1,h2 version will be ok as well and is much like talked about here..
I generally try not to out-think search engines but rather decide what is more useful to my viewers to know.
Sometimes you can sweat the small details too much and lose the bigger picture 
(If you had the facilities you could try either version for a month or so and monitor which gets the most traction.)