Hello C172Navigator,
It might be worth investigating changing the switch + indicator for a gated flap selector. I used to fly a C172P which had a gated flap selector but no indicator. Now I am in a group with a Reims C172M which has the switch + indicator. Our indicator works fine but I prefer the gated selector since it removes the need to hold down the switch and check setting on the indicator, you just move the selector to the required gate and return focus to the job in hand. If your aircraft has 40° flaps then you might find the the gated selector are only available for the later 30° C172 models.
Just a thought......