Raise more pre-flop. $2 is much better. $1.50 is mandatory.

Post-flop is fine. I'm OK with getting it all in here against an aggressive player at PArty's 25NL. He could easily be way behind you, so without a closer read I'm fine with this.