It'll still fit. 

And holy crap you're right about an upgrade. That's about as big of a jump that exists in any brand, good choice