Brechin, I'd absolutely recommend Scrivener, but it does have a learning curve. For me, though, it was well worth it: it allows me to see the entire structure of the MS all at once, and I can easily move around and archive pieces. I also love being able to easily generate multiple ebook formats (as well as Word and PDF docs).
It's not everybody's cup of tea, of course. If you're mostly happy with something like Word, you probably won't find Scrivener's extra features to be worth it. That said, you can get
a fully-functional 30-day trial copy, so it's free to whack at for a while.
It comes with a tutorial, and although it's kind of screenplay-oriented (or used to be), it's well worth going through the whole thing. I can also recommend
this book, which is worth it just for the section on compile settings. (You can probably find the same information on the web, but I like having it all in one place.
)
I took two days off (ooo, irresponsible!) but started my (hopefully last for a while) revision pass today. I'd like to get the readthrough done by Friday, and take the weekend to incorporate the changes and polish, and hopefully send it to my agent next week.