this is my fav scherzo, i think it's 'done cooking' between now and the final public presentation, i'd just 'let it simmer on the back burners on low heat' that is keep practicing the 'performance' of it, i e record more, find small audiences to play for, find a pinao in a public place and play it, get as many full runs nonstop in front of 'audiences' as possible, that will help things continue to settle in.
sounds great. congrats and job welldone. please record and post the final performance if possible.