Migrating between Macs

Hi guys. I currently own a 2.1GHz MacBook and I may be upgrading to a MacBook Pro pretty soon. My question is, what's the best way to transfer all my files over? Mine has a 320GB hard disk with a boot camp partition on it. I'm hesitant to use the migration assistant since the partition can't be copied over, plus I presume merely swapping the hard disks isn't going to work since the drivers won't match. Are there any better ways out there, or am I gonna have to transfer everything over manually and re-install the boot camp partition? Any ideas? Thanks!