More advice, semi-solicited, I guess!
I'd start with the right spring rates, sag, and damping adjustment. Modifying geometry before that won't likely give you a good result under any stressed conditions. And having a bike set up properly for you is so much more enjoyable, and safe, to ride.
I would add setting up controls, as most of them point to the sky creating all kinds of bad body position.
Get good body position, still critical for normal on road duties.
Then geometry.
Then ergos.
It sounds like a lot of work, but it really isn't, and the outcome is so much better!
Good luck. Let us know how it goes.
until