You'll definately want to consider going to 6.1.0 Beta Release 2, which is coming shortly.

If things are still pretty miserable, we may have another solution available pretty quickly.