25 NL 6-max... connected board vs overpair

[bigbb33]

Poker Stars
No Limit Holdem Ring game
Blinds: $0.10/$0.25
6 players
Converter

Stack sizes:
UTG: $20.30
UTG+1: $6.40
CO: $4.85
Hero: $25
SB: $7.15
BB: $29.45

Pre-flop: (6 players) Hero is Button with
UTG folds, UTG+1 calls, CO folds, [color=#cc0000]Hero raises to $1</font>, SB calls, BB calls, UTG+1 calls.

Flop: ($4, 4 players)
SB checks, BB checks, [color=#cc0000]UTG+1 bets $1</font>, [color=#cc0000]Hero raises to $3</font>, 2 folds, UTG+1 calls.

Turn: ($10, 2 players)
[color=#cc0000]UTG+1 is all-in $2.4</font>,

---

He limped from early/mid position, so he could have anything excluding AA or KK, most likely.

On the flop he bet out $1. I thought I was likely ahead and he was on either the flush or straight draw, and so 3 bet him. Do you think this was the right move, or should I have bet more?

On the turn the likely worst possible card, the As, comes. This completes any flush draw, the 2 straight draw, and any Ax, like A5-A3.

He bets out first for 2.4, into a $10 pot. I'm getting a little over 4-1 here, but what can I beat?

I really put him on either an Ax that made two pair, or a flush draw. I doubt he has the two, but it's still possible.

What do you think the right move is here, given the odds?