Upgrading Amp or new receiver...Help!

[liebherr954]

Hi guys!
I could really use some advice and help in a big way.

I am going to be upgrading my home theater in the next couple of weeks and was wondering what would be the best way to go?

I currently have the following equipment

Klipsch RB-81s (mains)
klipsch RC-52 (center)
Klipch Quintets (surrounds)
Klipsch sub 12

Yamaha RXV 596 (8 year old receiver)

Samsung series 5 50" TV

PS3 80 gig that I’m using for a blu ray player.

I was thinking about getting the yamaha rxv 765 receiver but I’m leaning towards the Emotiva UPA 5 amplifier. My friend brought over his older Adcom 545 amp and I was completely blown away with it! Even though the RB-81s are a bookshelf speaker the detail and bass response was a night and day difference in music, I watched a couple scenes of Master and commander and it did sound better.

Anyways I’m wondering if upgrading to the UPA 5 now and waiting several months to upgrade to the Emotiva UMC 1 would be a wise move. Or should I look at a higher end Yamaha receiver like the RXV 1900? If I upgrade my receiver I will stay with Yamaha because its they are the most common receiver here (central Ontario, Canada)

I would like to get the DTS MA and DD HD audio now but 6 months from now I don’t want to regret not getting separates.

Please help!

PS sorry for my rant.