Postflop: Against his stack size I completely agree with your play. If he was 100 Bb deep we can consider folding vs a passive fish but with 40 BB there's no way I'm folding in a spot where he can have plenty worse.