Very interesting topic. Maybe we can work on it together. I would have a look at the blockchain code later.
As a first approach, I would consider the witness shuffle...