I dont know if your still around but I think where you ran into trouble is when you did a 25% water change twice ammonia gets high in your tank when you add fish lots of times for the first time or when you add alot of fish at one time you really just have to wait for it to cycle threw or do a small water change (10%) but when your first setting up your tank even that can throw it off so its better to just wait it out. oh and I dont remember if you said your angel fish are still alive or not but I dont think they like all the movement in the water I think you would be fine as long as you have one good filter and enough air for your tank and I'v been told that ph for your tank kind of depends on where you live unless you want to use chemicals for it so dont freak out on that to much mine stays kind of high and my fish do great. hope this helps