I think 1 is ok...it is a wa/wb but at this stake the hands you are wa of will sometimes call the flop raise and open push the turn. also, you are basically heads up as the short stack doesn't really count. imo you generally get more value by calling the flop and reevaluating the turn though.
#2 - I probably bet less on the river, but think the fold is ok, depends if you've seen him do this too much though.