Concerning Diesel Punk, I believe the excellent Day After Ragnarok by Kenneth Hite is also considered part of the same “genre”.