Bach E-flat Major P&F ("St. Anne")

I started work on the venerable BWV 552. (Ha-ha, venerable, St. Anne, get it?) I'm trying to use historically-informed fingering, something I was not properly aware of in my studies of Bach during my first organist incarnation. I don't know if it's just me, but I found working through fingering the first page of the prelude to be quite difficult. The hands are hopping all over the keyboard! Which makes sense; it is (or can be, depending on interpretation) quite a lively piece. I think I have a working approach for that first page. Let's see if it holds for the further pages...