Is the 2.3Ghz 15" rMBP enough?

I'm looking to purchase the high-end 2.3Ghz 15" rMBP. I'm wondering if the 2.3Ghz should be enough; because last year's CPU upgrade had more L3 cache, and I'm not sure I need the upgrade. But I'll let you be the judge of that.

I'll be doing the following:

• 3Ds Max + Maya
• Programming (C++/Javascript)
• Adobe Suite (Photo, Video, Web)
• Logic Pro
• Windows 7 (or 8.1)
• Accounting software (Sage 50 - On Windows)
• Gaming (On windows, I would love if this got atleast 60FPS on modern games like BF3 and such)

I'll need the following out of the machine:

• Atleast 5 years of solild work out of it with little to no issues
• Atleast 8 hours of battery life, some say the 2.6Ghz gets less than advertised and I'm not a fan of that.

To repeat:

Will the 2.3Ghz Core-i7 Quad-core (high-end) rMBP be able to handle what I need or should I upgrade to the 2.6?

A side note:

I will be building a custom PC with the broadwell chip next year, my budget for that is around $2,000 and I feel that will get me a very respectable machine. I only say this because it might impact your decision on recommending the 2.6 over the 2.3.

Thank you.