Gnome-Shell freezes/crashes after resuming from suspend

In Ubuntu 14.04.2 LTS using the Nouveau graphics driver on a Macbook Pro 5,5, if I suspend (either by closing the lid or by running pm-suspend), the computer correctly suspends, but after it resumes, my screen activates and I see my entire desktop and can move my mouse, but all the other controls and windows are frozen.

Expected result:
After resuming from suspend, a login prompt should be shown to unlock my desktop.

Actual result:
A frozen unusable desktop is shown.

Attempted fixes:

Initially, I'm able to switch the a console via Alt+F4 and login, so I can confirm the kernel hasn't crashed. From this console, I've tried restarting gnome-shell with:

    gnome-shell --replace

but that has no effect. I've also tried restarting lightdm with:

    sudo service lightdm restart

which does immediately kick me out of the shell and back to lightdm/gnome-shell, but the interface is still frozen, but now also the Fn keys, so now I'm unable to return to the console. At this point, I'm forced to do a hard-reboot. This bug essentially disables the suspend/resume feature on my laptop, making it significantly less useful, since I suspend my laptop frequently.

Thinking it may be a problem with Nouveau, I tried purging it and installing the proprietary Nvidia drivers with the "Additional Drivers" dialog, but after rebooting, my screen was almost completely unusable. It displays a window showing "Your screen is running in low-resolution mode" with an OK button that allows selection of possible alternatives, like reconfiguring X or exiting to a console, but these options either immediately jump back to this menu, or freeze the screen entirely. Attempting to "continue with the current resolution" results in a completely black flickering screen.

This may still be a bug in Nouveau, as google shows several similar bug reports with resuming using this driver. However, since none of those reports were able to confirm this, much less fix it, I can't say for sure. Also, since on a fresh reboot with Nouveau, my desktop works and even after resuming from suspend, I can see my desktop, I'm inclined to think the problem may be some other component. Please let me know if there's someway I can more positively identify the source of the problem. I causally checked the Xorg.log and dmesg and didn't see any errors, but I'm not sure what I should be looking for. Nouveau seemed to report resuming from suspend had succeeded.

Some users reported a similar problem happened after upgrading kernels, such as from 3.13.0-24 to 3.13.0-49, so I tried reverting to the 3.13.0-24 kernel, but that didn't fix the problem and caused my wireless to stop working as well.

ProblemType: Bug
DistroRelease: Ubuntu 14.04
Package: gnome-shell 3.10.4-0ubuntu5.2
ProcVersionSignature: Ubuntu 3.13.0-49.83-generic 3.13.11-ckt17
Uname: Linux 3.13.0-49-generic x86_64
ApportVersion: 2.14.1-0ubuntu3.10
Architecture: amd64
CurrentDesktop: GNOME
Date: Tue Apr 21 08:58:04 2015
DisplayManager: lightdm
SourcePackage: gnome-shell
UpgradeStatus: Upgraded to trusty on 2015-04-19 (1 days ago)