I use Quicken 2002 to keep track of financial transactions throughout the year.

I am frustrated by the sheer amount of mindless mousing and clicking around
that it takes to keep all my various accounts updated. The fact that it requires
you to create a separate account for each Mutual Fund holding doesn't help
matters.

Mind you, Quicken does have a "One Step Update" feature which downloads
transactions from all accounts at once. But, the downloaded transactions
are all sent to a sort of limbo (actually several limbos, one per account)
where you have to do additional work to get it actually imported into the
account register.

What is the better upgrade if I want a more automated experience?
... Quicken 2004 or MS Money 2004?