When you find an amp you like, get a home demo before spending any money. I have a 5800. Although I agree the power amp is the weakest link of this receiver it still is pretty good. You may be surprised how well it compares to some seperates. It has a fairly natural tonal balance and fairly good dynamic capability. Its weak point is it is only average in its current capability so it can't drive difficult loads well at high volumes. With most normal speakers it's fine. It also doesn't resolve that last bit of detail the best amps do. $2K used will probably sound better than the 5800's amps but at $1K used I'd only give 50/50 odds it will sound better. It may do some things better, but others worse. Trust your own ears.
I'm not trying to discourage you from going the seperates route. I use my 5800 as an HT processor in a primarily 2-channel Rowland-based system. I'm just trying to point out that inexpensive seperates may not be any better than the 5800 and to be careful before spending your money. A lot of people automatically assume all seperates sound better than all receivers. It just isn't true in the case of the 5800.