Is it worth it to upgrade my 8800 to the 8820 to take advantage of the wi-fi, or should i wait until a blackberry device comes out with wi-fi, that will also be HSDPA compatable? Will that be any time soon?

You should consider revising your thread title.

I would concur.

In answer to your question: it's really up to you and what you need/want.