I think pre is close. 15/12 3betting isn't nice, but you do have position with a hand that can flop pretty well.
I don't like the flop raise though. As you said, if he shoves, you're calling with 8 outs and 8 high. You have a decent draw, on a board with no flush draws, I probably just call and see the next card. If he shoves, or even just calls your raise, you have to think you're way behind.
How many hands did you have on villain?