The problem here is that there's not good alternative to Lithium for now. LiFePO4 (commonly seen as LFP) chemistry is a little safer, but also less energy dense & heavier. It's unclear to me whether or not these downsides rule out that chemistry's use for bikes as space and weight can often be at a premium.
Yes, but I would only do that for a car for which no tanks are available any more. If you can still get a NOS one then you probably should, unless the leak is very small and on the top of the tank (where it rarely is...).