I used to be a strict advocate of "entire song/continuous guitar part in one take". That's how my first demos were all done. For my full length, I got a solid take on the entire song, and then punched in certain sections that I felt needed a better performance.
For my new stuff, I think I'll record two-three riffs at a time, to keep the transitions smooth and natural and to save time with tracking.