But Hillary didn't get elected as Ginsburg wanted; Trump did and Justice Gorsuch was selected as a Scalia-clone instead.

Since "McDonald" and "Caetano"  were decided in 2010 and 2016 respectively and since both specifically affirm Heller, Justice Ginsburg (already 84 years old),  will undoubtedly die or resign with Heller still being the law of the land.