Yay! I'm getting another betta next week. Yes, I'm already addicted!
I really suggest you buy the tank first, and let the water sit for a day or two. Also, we just use water from the tap, but make sure you put some conditioner (we use the brand "Start Right") so that it removes chlorine and chloramine from the water.