Repairing a Dunhill Rollagas Lighter

Lighter would spark but not light. Filling the lighter with butane resulted in it immediately leaking out from the reservoir. I obtained a repair kit and following the instructions I replaced the "O" rings. Although the lighter was no longer leaking, gas was not getting to the flint wheel at the top. I suspected a clogged needle valve and cleaned out the valve. The open close valve is inside the needle valve and actuated by the snuffer in the cap. The repair kit does not have any parts for the inside of the needle valve. I opened the needle valve and replace the seal. I had to make a seal from cutting an "O" ring. The lighter was then getting gas up to the top but it was giving off too much gas and the gas was leaking with the cap closed. I'm getting erratic flame sizes and sputtering of gas.
There seems to be a very delicate balance to keep a reasonable size flame and sealing the gas so it doesn't leak. The size of the flame can be dictated by: the amount of felt at the bottom of the needle valve; the number of washers on the needle valve; the thickness of the shut off valve inside the needle valve; the adjustment the gas control valve and the adjustment of the flame control valve.
I spent too much time on this project and have no desire to keep working on it.