No Amit Shah's stock has diminished within BJP after his failure to control Shaheen Bagh protests, losing Delhi election badly, and mismanagement of riots. BJP really has no alternative to Modi at the moment, although some of their chief ministers like Ajay Bisht (a.k.a. Yogi), Shivraj, Yedurappa, or Fadnavis (ex-CM) are being primed for that eventual role. The problem is after Modi, none of their leaders have enough acceptability. Even if BJP has to keep Modi alive on a ventilator with oxygen supply, they will do it because he's too much of an indispensable brand for their party.
With any luck, BJP will not be able to complete its 5-year term that expires in May 2024. They are like a house of cards, and I am awaiting their government's collapse.
As per many Indians, the Congress is the lost case under Rahul Gandhi and BJP will come again in 2024 under Modi or Amit Shah unless Indians vote for domestic issues not ultra nationalism.