That was my main point above...
The moment you ask "Should I wait for market crash", you are timing the market
When market crash really comes, you are either waiting for it to crash it further, or get in too early (think it is bottom), and sell in panic when it drops again.