Well, according to that wiki article, the logo may be a mix of both castles...
Maybe they'll just replace it all together with a Death Star or the Millennium Falcon, or something... Then Mickey passes by on an AT-ST, firing at the logo, or something... Anyway, for now we just need to see if the movie even comes out on time, what with Harrison Ford's leg now being reported as broken and needing 6+ months to recover.