Well I got tired of waiting and just got the 15/2.5/16/512 at Best Buy.
So now I have 30 days to price match or get a different one after WWDC just in case.
They price matched B&H and gave me $300 off.
I am happy
Do you happen to have the link for the one they price matched? I see it for 2289 on B&H. 2199 would be even better.
EDIT: Nevermind, I think I just found it! Actually I think the graphics card is the difference.