Can you replace it for the same investment?
What you have is at least known, a change is always a gamble.
Can you reasonably expect good service from your 540 once the current list is addressed? Sometimes you have to cut and run, better to do so before anymore investment.
Too bad we are an ocean apart. I'd be all over a 540it for what you say she'll bring there.