Sometime the salt and the water changes will take care of the fins, gills, and scratching. It is usual for all fish to occasionally scratch. Also Melafix treats bacterial infections and will promote re-growth of damaged fins usually within a week. The floating near the surface is usually normal for discus. That you might take out of the worry list.