Angelfish and goldfish are definitely NOT compatible. For one, goldfish are cold water fish and angelfish are not.
Furthermore, goldfish move slowly and angelfish can be agressive. Goldfish are extremely dirty fish - they poo a lot - and angelfish are more fussy with their water conditions. There are a whole host of differences in the two species of fish and their living requirements. Keeping them together is cruel.
I suggest you decide if you want to keep angelfish OR goldfish before you proceed any further.
I hope this helps.