Thanks! Yeah, I'm definitely considering Dragon-type or Psychic. I wanted to go catch Dratini, but the only place they're available is by a waterfall on the fourth level of Mt. Coronet, and only by Super Rod.
Holy crap, Salamence looks like it might fit the bill for the replacement of Staraptor.
I think I'll catch a Bagon and train it in place of Golem. This works perfectly. Thanks dude!