Yeah, get youtself a 802.11b card for both, and you'll be much happier. Worse battery life, but much better range. (Though, in theory, there's a class of bluetooth device that has a higher range (I or III, i'm not sure which way the scale goes) but wi-fi is designed for wireless surfing, bluetooth is designed for wireless syncing.

Matthew