Good news so far, pleased to hear the consultant is getting involved in the removal of the catheter. I always made sure I was well hydrated before having the catheter removed.
As regards bypassing , drinking plenty of water should keep fluid going through the catheter and keep debris from building up inside the catheter. Make sure the bag is emptied before it gets more than half full. Make sure the pipes don't get kinked. I never bypass when lying down.As suggested use the lubrication gels in the eye of penis, it can help with bypassing. The bypassing is partly about the catheter balloon position in the bladder.
I tried numerous anti spasm medications ,some take time to work. I found trospium chloride to be the best.
Hope the recovery continues.
Thanks Chris