So, if 3.6 doesn't work, wait until 3.7-release hits the mirrors, or grab a snapshot (which is technically the next release) and see if it improves.
The snapshots are already well past 3.7-release, so you can't "upgrade" from a current snapshot to 3.7-release without problems.
