Yea a 2 CD reissue would be just the job including demo's & live tracks.
The problem might be though is that they'd probably include the B-sides which most people already have.
how about 2 CD's + DVD
The Album + 2nd Cd of B Sides & Demo's + A DVD of the album live.
And make sure all the rarities & different released versions get included.