I used to be very big into freshwater.....I had angels, discus, guppies, etc. You name it I had it....I used to have 20+ tanks going. With any discus, angels, or chiclids I always used ro/di. Mainly because I bred most of them. That was a cleaner water. Once in a while I would add black water extract to the angels and chiclids. I did it all the time with the discus. I have a freshwater cube going right now with german blue angels and plecos in it.....all I use is the ro/di and I have drift wood in there that I didn't boil to much so that there would be some tannins in the water. I think it gives it a more natual look abd the fish seem to like it.
So after my rant....with what you have...ro/di water would be fine unless its a planted tank as well. Then it should be boosted with more nutrients.