I seem to be in the minority but I really enjoyed Raw. There were three solid matches and they seem to try to build some continuity. Most people were used where they should be used (3MB as entertaining jobbers, Cesaro & Kofi as jobbers to the stars, etc) and even Cena sold a story instead of overcoming all odds.
If they wanted to sell more HBK DVD's, wouldn't they *want* Shawn to be a face at the time? Plus you must remember that Flair is seemingly always a face in the Carolinas, even when he plays a heel; be interesting to see if it's a one-off deal though.