Question

I haven't been able to find one.
P.S. not the starter. I'm using the water starter

Answer 1

Well, here are some options:

Growlite, Routes 36,37,49

Magmar, Burned Tower

Onix, Trade in Violet City, Cliff Cave, Union Cave

Wooper and Quagsire, to many to mention :p
http://pokemondb.net/pokedex/quagsire
http://pokemondb.net/pokedex/wooper

Nidoran (male & female), Routes 35,36 (evolves into Nidoking/Nidoqueen)

Geodude, just about everywhere :p
http://pokemondb.net/pokedex/geodude

Sandshrew, Union Cave

These are all Fire and Ground Pokemon available before the 7th Gym that are not starters. I will edit in the sources later.

Answer 2

Fortunately I have finished this game so
i will be able to help :)Here it goes:

GROUND
Steelix-cliff cave
Nidoking/queen-evolve nidoran from route 36
Quagsire-evolve from wooper from route 32
Rhydon-evolve from rhyhorn from safari zone
Tyranitar-evolve from larvitar from safari zone
Sandslash-evolve from sandshrew from safari zone

FIRE
Arcanine-evolve growlithe from route 37
Magmar-burnt tower
Flareon-evolve eevee with fire stone
Entei-he is roaming in whole region

Thats pretty much it , Hope I helped :D