At the rate you're going, you should be quite pleased with yourself. I'd take that momentum and keep plugging away. You're SUPER close, so don't quit now.
For me, switching to the correct nanoKONTROL scene is not an issue, as I have no choice. But if you do have the option, go for it!