I would definitely consider Jiko (you can still order the filet with mac and cheese) or Tiffins. I recently had an excellent meal at both, Tiffins really surprised us at how excellent it was. Personally I was extremely disappointed with California Grill when we ate there, it’s a great atmosphere and the service was great but the food was not.