You're absolutely right and, thankfully, NASA agrees with you. NASA plans to continue operating Hubble even after JWST is up for as long as Hubble still functions. Without shuttles, there will be no more servicing missions, so when it breaks, that'll be it. Until then, Hubble will keep doing its thing.