Will there be enough time? When is Russia removing their module?The US has one proven spacecraft, the Cygnus made by Northrup Grumman, that has flown (Atlas 5) and could also fly on a Falcon 9, has the capability to boost ISS.
Boeing's Starliner, expected to make its first flight to ISS this year, could also boost ISS.
Space X Dragon does not have the capability.
Yes, there is plenty of time. Current modelling shows re-entry around 2035, at least ten years away. Of course, it depends on how strong the next Solar maximum is. That will occur around 2025.