The new query plan stabilization features in 12cEE really help with this. Hints are a pain when upgrading Oracle major versions as they can affect query correctness, as my boss found out painfully last week ;(