More activity and resisting you is also a good sign. The flipping over is stress. You need to find a way to relieve his stress. He may need another Vet trip, but I'm not sure why he is still retaining fluid. It is normal for them to loom really bloated when they absorb water and are well hydrated, but when they urinate usually the water is gone and they must reabsorb more fresh water.