Evolve first, if the moves are good, then you worry about CP. The creature's max CP potential remains the same and is solely dependent on the pokemon breed and your personal trainer level.