I would bet more on the turn. There is so much out there that you really want to charge the max for all draws imo.
Also as you said I think pounding the flop for a bit more is good but hindsight is 20/20. If the turn was an offsuit 2 then your flop bet would be fine.