I agree, it is a nuisance. EE are not alone though to be fair. Yes, your idea is a good one, as is that from Hans Christian. Both are better than my alligator clip method
As for changing it out, it is not very accessible. I think it would be a PIA to do it. But if anyone can, it is Hans Christian