I don’t have a recommendation for you, really. Especially since you said “…the urge to order more lamps has been enervated” already.
But, I feel like somebody ought to speak up for the FW3A. You said above:
but it is actually a bit different in a couple ways. First and foremost is the tail e-switch on the FW3A versus the side e-switch on the D4. Maybe that’s not enough for you. But for some people, the switch placement is a huge thing.
Anyway, if you do decide to get a headlight, I recommend the YLP Panda 3. The YLP Panda 2M CRI was mentioned also above, if you care a lot about high CRI. But I’ve not owned it, so I don’t know if it’s good.