Kelly:
Yes: you do have a mess but IMHO nowhere close to being overwhelming.
- [1] Do not feed for 3 days and subsequently feed at 1/2 of your normal rate for 11 days;
- [2] Perform 25% bi-weekly WC's for two weeks; and
- [3] Placing some filtration media from your 10G into your 40G will help but if you properly cycled your tank the benefit will be minimal.
With respect to the ammonia in your tap water use Seachem Prime as dechlorinate for WCs. This product will not remove ammonia as stated on the label but will reduce the ammonia to nitrates.
Please immediately post your filtration equipment and after a week your water parameters.
TR