I might have put a small bet out on the river so that the re-raise wouldn't feel completely like a trap. But you conned him into giving you his whole stack. No problem here

As bonch would have said... I probably would have folded pre-flop btw.