This thing happening every 3 years, Big blasting pump on btc make investor buy bitcoin high, then all are sitting and waiting.... I am sure we will get closer to 8500 in this two days... Only one thing can manipulate price - bitcoin halving, it will be in may 2020... If price will not jump, miners will be off and transactions will stand for ages....
for me better to wait 2020 now 
Not sure what you mean, its not better to buy in 2020, now is the time to buy because well likely get a massive rise after the halving.
If you mean best to wait until 2020 before thinking about a big rise then yes, you are right on that.