Hand pain flair

I’ve been doing really well lately with pain management. I cleaned a lot last week and I haven’t been able to get the joints in my hands to stop hurting and the swelling to go down. I have surgery in under a month and really don’t want to go on steroids. I’ve tried icing and heat and nsaids. About to order a paraffin bath. Any other advice?