Surface 2 - Sleep Issue

I just upgraded from the Surface RT to the Surface 2 and am still experiencing a bug that is driving me crazy. On my Surface RT I would intermittantly have a problem where the tablet would not wake from sleep when I touched the windows button on the front of the device. Sometimes I would have to hit it 10 or 15 times before it would come on. I thought this would not be a problem on the Surface 2 device, but am having the same problem about once a week. Except this time it is worse. I hit the windows key and get the haptic feedback, but the screen won't turn on. I end up having to hold down the power button for at least two minutes before the device will reboot and respond normally. Is anyone else having this issue or should I take the device back to the microsoft store?