Manfred, you'll have to get rid of your goldfishes it really wont matter if your temperature is at 25șC goldfishes produce toxins that are harmful to tropical fishes. Which means goldfishes can ONLY be with other goldfishes. Angels are delicate fishes and do require warm water with other angels and small schooling community fishes.
Angelfishes are cichlids, and if you keep them with other cichlids you will need to have either a lot of live plants (fake plants aren't good for angelfish fins) and/or rocks to form a small shelter and the only type of cichlids I know that are capable to stay with angelfishes are ram cichlids and maybe severums. Although severums are just as aggressive as angels when both angels and severums are fully grown.
You can keep Angelfishes with swift swimming fishes such as Danios. Danios are fast so they can stay in with many fishes. Since not all fishes are as fast as Danios. The only fish that is as fast as Danios are the Buenos Aires Tetras
Good luck!