File not found 'Flutter/Flutter.h' Fatal Error Flutter 2.5.1-CodePudding

I recently got a new M1 Mac and updated both the flutter version (to Flutter v2.5.1) and Xcode version (to Xcode 13.0) (Not a wise decision). I tried running on the iOS simulator and got stuck at the error 'Flutter/Flutter.h' file not found'. I have updated all my dependencies to the latest version. I tried deleting 'iOS' folder and doing flutter create, but this brought me back to the same error again. I tried all of the recommended solutions from previous posts on the same issue to no avail (ie. removing Flutter.podspec, removing pod file.lock). I also didn't switch from master branch to stable (I was always in stable). I have tried almost all the solutions, but none of them have fixed it for me. Thank you for the help.

(Side Note: I tried running on Android emulator and everything works fine except for GoogleSignIn)

ravipenikelapati@Ravis-MBP Creww-App % flutter doctor -v
[✓] Flutter (Channel stable, 2.5.1, on macOS 11.6 20G165 darwin-arm, locale en-US)
    • Flutter version 2.5.1 at /Users/ravipenikelapati/FlutterDev/flutter
    • Upstream repository https://github.com/flutter/flutter.git
    • Framework revision ffb2ecea52 (11 days ago), 2021-09-17 15:26:33 -0400
    • Engine revision b3af521a05
    • Dart version 2.14.2

[✓] Android toolchain - develop for Android devices (Android SDK version 31.0.0)
    • Android SDK at /Users/ravipenikelapati/Library/Android/sdk
    • Platform android-31, build-tools 31.0.0
    • Java binary at: /Users/ravipenikelapati/Downloads/Android
      Studio.app/Contents/jre/Contents/Home/bin/java
    • Java version OpenJDK Runtime Environment (build 11.0.10 0-b96-7249189)
    • All Android licenses accepted.

[✓] Xcode - develop for iOS and macOS
    • Xcode at /Applications/Xcode.app/Contents/Developer
    • Xcode 13.0, Build version 13A233
    • CocoaPods version 1.11.2

[✗] Chrome - develop for the web (Cannot find Chrome executable at /Applications/Google
    Chrome.app/Contents/MacOS/Google Chrome)
    ! Cannot find Chrome. Try setting CHROME_EXECUTABLE to a Chrome executable.

[✓] Android Studio (version 2020.3)
    • Android Studio at /Users/ravipenikelapati/Downloads/Android Studio.app/Contents
    • Flutter plugin can be installed from: