I agree with Stinky Dinkins, I would rather not wait years for a Blu-ray release. I have several people I’d like to give copies of v2.1, none of which are technically minded. For Joe 6-pack, menus are very important.
Also, I like Murry Sparkles’ suggestion of an all-encompassing trilogy wide Bonus Disc. Lots of Hollywood movies put only the film, audio options, subtitles, and maybe a trailer on Disc 1. Disc 2 and 3 have all of the extras. That would also give you time to complete the extras to your satisfaction.
This is just my two cents, Harmy. Do whatever you think is right. =D