Fixed the problem by deleting my gmail account and re-adding it from the BB email BIS settings. Everything (calendar and contacts ) started syncing immediately. Didn't lose anything on the BB but I did end up with duplicates in the calendar. Small price to pay IMO.
Weird but something to watch our for when updating OS's on the BB