The solution we eventually ended up with was to have matches that the player needed to light before using them on a candle or lamp. This allows the player to light many nearby light sources at the same time, and also lets the matches serve as an additional light source. This might seem like a slight change but it comes with a lot of benefits.