If you want a good bike for the really chunky stuff then I would suggest the Jedi. I have owned 2 of them and they are great bikes for carrying speed through rough stuff and not feeling as beat up after. Also the suspension handles braking really good.
Another option since you have that much money to drop is the Turner DHR. That's what I am on now. It is a good balance between plow and pop IMO. It brakes/pedals really well. I do get a little more beat up on the really rough stuff but i like it a bit more on the really technical stuff and also on the jump lines.
It sounds like you have spent enough time on both the Jedi and the DHR to develop a good feel for their capabilities. What do you like better about the DHR and what do you miss from the Jedi? I'm in the market for a new frame myself and I keep going in circles between the two.