I have two of these cans - essentially new. Cans are good but the caps and spouts are terrible. Anyone come up with a solution to replace them? I found the EZ Pour stuff but not sure if they fit or not. Any help or experience would be much appreciated.