But he also said it would be before the end of "this generation".
In this you are correct, jeremy. So, let's delve a bit and see what the word 'generation' that is used in the Greek actually meant. It could mean those people who were born within a 20-25 year period - in the way that English tends to use the term; however, it could also be used to refer to a race (in this case the Jews) or a family - a whole string of 'generations'.
Also, Paul seemed fairly convinced it wasn't going to be long.
Its worth rereading what he said, jeremy. He didn't state that it wasn't going to be long, but encouraged the believers to live AS IF it wasn't going to be long. In other words, it could have been imminent (ie within the lifetime of those Jesus had taught and lived amongst) but it might not - so live as if it was going to be. Think, for instance, of the story in Matthew 25 of the ten young women who went out to greet the bridegroom; 5 of them took extra oil lest he was delayed, and 5 didn't.
Your Messiah is a busted flush, I'm afraid.
I've yet to see any evidence for this oft-repeated sentiment, jeremy. Do you have any.