Will lithium cells get cheaper ?

short answer...NO
waiting will not save u any money,
in fact, the longer you wait to buy an electric bike with lithium batteries,
the longer you will be paying for gasoline.