I would go with B. Put the prequel trilogy all together. If you like Q2, then do that. Personally, I would do all Hal’s. His Phantom Menace feels like not only an improved version but a version that still feels like a complete movie.
Yeah, maybe a full HAL would be the best (with B). Mainly 'cause Q2 do not really sit well as a whole in the “machete”.
Thanks. Still waiting more opinions.