I'd have to say keep the Touch. The 800/810 with 2008OS is nice but not ready for the linux newbie as it calls for a lot of "tweaking". What apple has down is the "it just works" experience. With the new 2008 OS there are a lot of usability improvements and a fair share of "issues". The fact that most apps have to be redone in order to work is a big issue and many are not yet availalbe.
The Apple SDK will be availalable by the end of Jan and with the greater number of users for the Touch/iphone than the 800/810 there will be many 3rd party apps available .
If what you want is a good PIMP (Personal Internet Meda Player)
then the Touch is a better fit. The N800 is more of a linux hacker/hobbyist device. The next generation (N9X?) device should be better but it won't be out till next year.