Almost. I can't promise I wouldn't bring a constitutional challenge.
In my view, the remaining failing that hasn't been addressed by the changes you just went through would be the complexity of these motions. If we can take the three party, the notice requirement, and the separate in-camera hearing, and condense them down into a codification of the common law rules for a mid-trial application, then that, on top of the changes that you all suggest, will go a long way towards minimizing the constitutional problems, the problems for the complainant, and the problems for the administration of justice generally of having these things drag out to potentially unconstitutional lengths.