You apprear to be pretty sound and trust me I'm not one to give advice but based on my experience I would move up to 10nl. You would still be well rolled and in good position. I just think the difference is such it would just make for a better use of your time.
As for these hands I'm kinda torn on 1. Maybe bet bigger on turn to take away odds but then that could put you in a harder decision if he still calls. #2 you played it as you should. Shrug it off and keep on grinding!