At the very worst, if you buy a Mac after Lion is released, it will be a free update.
As for the release date of Lion, nobody knows. There is speculation from just after WWDC in June to sometime in September. It could be that or it could be later.
I'm getting the feeling that Lion and iOS5 may be released at about the same time - whenever that is.