lMO, it doesn't really matter that much anymore. If both are being booked well, I'd say let the crowd soak it in and choose.
Remember the SHIELD and the Wyatt Family were both heels when their feud got started. Why should this be any different?
True. But the crowd was already really getting behind the Shield prior to that. They were slowly turning face going into it.