Switching to Mac - advice needed

So I was given a Dell at my job but I'm not liking it too much. It's really unintuitive, ugly and I think the screen is bent. Something's off about the picture. Pretty sure it's riddled with viruses too (thank you Microsoft). A lot of things seem to be going haywire.

I'm definitely switching to Mac but not sure if I should get a Macbook or wait for ipad which looks promising. All the possibilities of a regular computer, plus videos, books, music and unwired internet, without the hassle of a keyboard. I love the sleek design and the user friendly sofware.

Should I a get the Macbook or will they be obsolete once iPad is released

" The iPad has a 9.7-inch (25 cm) LED backlit multi-touch  display with a pixel resolution of 1024x768, 16 to 64 gigabytes (GB) of flash memory, a 1-gigahertz (GHz) Apple A4  processor, Bluetooth 2.1, and a 30-pin dock connector to sync with iTunes and connect wired accessories. "

Does that look better than a Macbook to you?