Here?s what I do:… note that two measures before the Allegro there is a diminuendo and also that it is a timpani solo.