If you have well water and not city water you should not need to use any conditioner at all. Well water is great for aquariums! Its usually hard water and has the basic minerals fish need anyway and it should have a ROCK solid pH level. I think you need to wait it out still, its still coming along. I know its hard not having fish in the tank but, its better then killing your pet. I have been doing fish since 1978 and its never gotten any easier to resist going to the LFS for some new stock!!! For the new tank!!! Maybe you should try the shrimp thing instead of the adding ammonia deal..??..!!..?? Anyway, before jumping to a new cycling deal let it set about 24/48 hrs and see if the nitrite goes up. If it does this is good, also leave the hood up on the tank if it has one. This will provide good area for the gas exchange to happen and it will expose the water to the bacteria in the air as well which can help the cycle. While on this subject be sure you have a lot of surface movement on the water as this is also important to the nitrogen cycle you are trying to make happen. OC will have some pointers too, I have been working for about 5 HRS on one of my Transmission websites so my brain is a bit frazzled right now anyhow.