What do you do on this river?

[Sir Jecht]

My second time at the $200min NL table at Casino Windosr. I again turned my $200 buy-in to right around $1800 before this hand. I am up against a very good solid player in this hand, but he does make moves, as any good player does.

Blinds are $5/$10.
I'm on the button with T[img]/images/graemlins/spade.gif[/img]T[img]/images/graemlins/heart.gif[/img]. He limps from EP and it folds to me. I make it $40. Both blinds fold, he calls.

Flop: 4[img]/images/graemlins/heart.gif[/img]7[img]/images/graemlins/club.gif[/img]T[img]/images/graemlins/club.gif[/img] (pot: $95)

He bets $75. I raise to $300. He calls. My read at this point is a [img]/images/graemlins/club.gif[/img] flush draw, with a possible 4 (as in A[img]/images/graemlins/club.gif[/img]4[img]/images/graemlins/club.gif[/img] Those are the kind of hands played for raises at this table.)

Turn: 6[img]/images/graemlins/diamond.gif[/img] (pot: $695)
He checks. I bet $400. He calls.

River: 9[img]/images/graemlins/spade.gif[/img] (pot: $1495)
The instant the river hit he went all-in. (which actually puts me all in for about $980) I....

What do I do at this point? If he was on the flush draw he missed. He is a pretty solid player, but I have seen him make moves with busted draws, or just plain bad cards (going in with them PF just to make a move later). So he has a pretty decent bag of tricks. I am about 70% sure he was on the club draw, but the problem is there is four to a straight on the board now, he only needs an 8. I find it hard to believe he went that far looking for a runner runner straight; if he hit the straight on the turn (with 89s or something) he would've almost undoubtedly check-raised me, so if he made it, it was runner runner.... that's my read on this hand. What do you do in this spot for a $1500 pot, faced to call $980. Results later.

EDIT: This happened a few weeks ago, and a little bit after the hand I think the correct move was to go all in on the turn for $1380 when I was sure I was good and just take down the $695 pot, since the board was scary. Anyone agree with that?