I don’t think that you need shots like Dooku leaving or so. If it is a dream sequence, then there is some room to ignore small logistical inconsistencies.

Here is another suggestion, prompted by your proof of concept. What if we start the dream with a VO from Obi-Wan prompting Anakin to hurry up, then cut to Obi-Wan being stopped by the shield, followed by Qui-Gon getting stabbed (crop the necessary shots to remove Maul). With this change, we can infer that Anakin feels somehow responsible for Qui-Gon’s death which would naturally fuel his desire for revenge. Furthermore, Obi-Wan might share that feeling on a subconscious level which would explain his harsh treatment of Anakin in AOTC.