Its upto you, if you love your ride then its worthy to rebuild it. But its really hard to rebuild everything, as we know that B12 is now too much old and its hard to arrange its every body part.
Regarding engines yes QG is a good option, but my recendation will be for QG15, and if you want to be fast with economy then QG18 is recomended.