"The rheostat in the original light switch barely works."

rheostat (and sometimes other electrical contact items): did you use/try a non-silicone/non-oil electrical contact cleaner?