Accuphase E380 upgrade?

Would it be worth to use my 1yr trade up program and trade my E380 for the the new accuphase E4000, which is basically the new E480 or just add a used $3-$4,000 amp to my e380? The upgrade would cost $7,000 here in the united states to go to the E4000, which is a lot.

OR...I could jump to a Hegel H590 for $3,500?

Speakers are B&W 804S which are 90db. the e380 sounds great, just wondering your thoughts? TIA....