I'd raise more pre flop since they'll call anyway.

If you call the flop then you should definitely raise turn as a set (in my experience) would bet 1/2 pot again.

Still I think you can raise the flop for value since most of his range will call.