Yeah, there are a lot of parallels just like that. Thunderbolt over Thundershock, Flamethrower instead of Ember... I'd say Surf has both those moves beat, though, since it hits everything on the field.

[Granted, that's kind of a double-edged sword if the user's got a Pokémon weak to fire on their team.]