On Starmie give it Rapid Spin since your team is somewhat weak to stealth rock (drop trick, you'll find you won't use it as much). Go with surf over hydro pump.
On Infernape, drop Nasty Plot and give him Choice Specs, trying to getting a nasty plot off is very dangerous and is often useless...