I'm afraid it's me again.
My advice is to do neither, yet to do both; so lt me explain. I think you should lower your sights slightly and get something like SC LX73 or LX83 + SPL 800 ultra or Paradigm Seismic 110.
Your title question is very hard to answer, and depends on how important the sub is in your particular listening/viewing habbits.
IMO. What I'm suggesting would give a big upgrade in both areas, only be a little outside budget and likely give you at least 80% (maybe more) of the performance that you were looking for.
I'm not trying to tell you what to do, but throwing out food for thought.