yes, I agree with you on all points.

Oil lamps can be dangerous. I have only one decorative lamp ; its design make it quite stable, but anyway the rare times I use it, I keep it under close watch.

Candles : I have a small stock, including a few emergency candles (by coghlan).

I would be tempted by trying an Aladdin lamp, but they don't seem to be available here.