SOPP308: Performing a long trill in Bach's Dorian Toccata

Let’s start episode 308 of Secrets of Organ Playing Podcast. This question was sent by Jaco, and he writes: Dear Vidas Thank you for your daily posts - it is really an inspiration! I really like Bach's Toccata in d (Dorian). It is a piece that feels like it has perpetual motion - something always keeps moving in it. It is quite a difficult piece to master, but I decided to learn it. The edition I am playing from is the new 2012 urtext Breitkopf & Hartel edition. It indicates a trill in measure 29 on the top e in the RH (please see below). However, it does not indicate when this trill should stop. The note is held on for another 2 measures. When should that trill stop? I don't know how to play the RH in measure 30 if trill has to continue, since a lower voice starts with that hand halfway through measure 30. Another question - I know the piece has to be played articulate legato. However, it does sound quite nice if the first 2 semiquavers on the motive on beat 1 and 3 are slurred (played legato). I have heard it on some recordings as well. Would this be considered acceptable to do? Looking forward to your reply! Kind regards Jaco