Yes - what you did sounds great! So hang in there on the ammonia levels - water change as needed to get them down, assuming your pH is over 7.0. I don't think you did anything wrong regarding the Badis. Sometimes the fish you get are already weakened for whatever reason, and the stress of a new tank is too much.