I think your play preflop was fine, a raise of that size is pretty standard seeing that you were under the gun.
Also in reference to question number two pushing is out of the question becasue unless he is a complete fish he has you beat, yet it is read dependant.