I've never heard this played, so my interpretation isn't coloured by any other versions I've heard.
I need to make the transition from bar 7 to 8 smoother (a fingering problem) and from bar 15 to 16 the hesitation was due to momentarily losing my place and panicking - I just can't seem to relax when the RECORD function is on!
Played on one manual, no pedals, a footswitch was used to advance the registration frame.