Not sure about that yellow bog you have.
While it is a bit wasteful I would be tempted to just buy a whole new khazi and improve the look of your bathroom.
Fitting an isolating valve on the inlet and is a definite though, specially if you decide to go the repeated fiddling with the existing...