Yuck. I fold to the flop raise. There are better times to get fancy and you only have legit outs if you think an A-J is really going to give you fold equity. That said, if you insist on playing this way your turn line is fine.

What's up with the river, though? If he actually has an ace he's calling down or raising you. If he doesn't have an ace or two pair, he might try and bluff you out on the river. Now that you've hit the queen you need to check/call this or you'll run into too many situations like this (and if Villain really IS trying to push you off your hand on the flop and turn you could have just lost this hand to QJ or KQ, consider that.)

Basically, don't get creative like this with someone who goes to showdown 38 % of the time, unless you hate money.