Hmmm....you know....I knew a guy that bought a used motor and it lasted 3 years...it was a bone stock 1600, but 3 years is great for a used $300 turn-key!
Maybe this would be an option, while you wait to get what you REALLY want???
I'm only saying this cuz your going to want more power....I promise you will......