More steam, definitely.
I'm enchanted by the historical aspect of steampunk. I don't like the idea of combining a lot of modern punk culture into steampunk. I doesn't seem to fit right to me; a victorian or other historical aspect completes the whole concept for me. And, to be honest, I can not see anyone of modern punk culture tilt carrying around steam-powered anything. :/