He definitely doesn't have dropsy, I see no pineconing. There is no need to do salt baths, just increase water changes and try fasting him for the bloat. You could also try feeding some daphnia which acts as a natural laxative for bettas.
edit: How much, how often and what do you feed him? How...