Antti,
I know exactly what you mean with the Gold Team, I had one in 9mm, I prefer 9mm over 38 just because of the cost and hassle of 38 and it sounds like you're leaning the same way. You could just change the barrel to one with no holes and use it with the existing comp, but unfortunately that little two port comp leaves much to be desired (which is why they drilled 12 holes in the barrel ). I think the best solution is a barrel with no holes and a comp with a modern design and at least three ports, then you could drill a few holes as you saw fit to flatten it out.