Also have this problem. Have tried using setstage CW03 210 and setstage CWSiegeObj 9000 to finish both quests and going straight onto reunification of Skyrim, but then I am unable to report in to General Tullius. Anyone else had better luck with getting around this bug?