I can't help you at this time with the correct bulb, but I will add that it is a simple solder job. In fact, if you decoderize your F units (at least with Digitrax decoders), you are required to transfer the bulb from the factory PC board to the decoder. I've done several, and it's not difficult.
DFF