ITR doubts

I moved to the UAE on a work visa. My salary is credited in AED to my UAE bank account. I also opened NRE/NRO accounts in India, but I did not declare myself as an NRI when opening them. I need advice on Indian tax residency (NRI/RNOR/Resident), ITR filing, and FEMA/banking implications. My situation: FY 2024-25: I was in the UAE for more than 180 days. FY 2025-26: I was again in the UAE for more than 180 days. My CA did not declare me as an NRI in the FY 2024-25 ITR. The FY 2025-26 ITR due date is approaching, and I want to know whether I should file it as NRI or not. In a future year (FY 2026-27), I may not qualify as an NRI because I might spend more time in India. Questions I want answered: Based on Indian tax residency rules, what should my residential status be for FY 2024-25 and FY 2025-26? If my FY 2024-25 ITR was filed with the wrong residential status, should I revise/update it? How do Income Tax Act residency rules and FEMA residency rules differ in my case? If I become a resident again in FY 2026-27: Do I need to convert my NRE/NRO accounts into resident accounts? Can I continue receiving my UAE salary in my UAE bank account? What is the correct way to bring that money to India?