BEVs will become more popular (in my prediction) because they are simpler than diesel, and are self-contained unlike electric trains that depend on external wire systems working, so they will be more reliable.