I have the same wheels and know what you mean about the water, i'm not sure mine have rusted yet, but can't see it being long
The wheel looks pretty nice for a steely.
I'm wondering about putting some kind of cavity wax in there?
As for this cap fitting, i bet it's the hub holding it off the nuts, i'd really look at putting something on the hub and seeing how far into the cap it makes it.