It's not ideal, but the "based on usage" is easy to manipulate. How I do it, is when I'm on Desktop 1, click the app that's full screen IN YOUR DOCK! Do not use Mission control. By clicking on the app in the dock it has, always for me, moved it to desktop 2 automatically.
Edit: Oh, and as Vel said, CMD Tab works to rearrange them too.