If you're gonna get a T2 you'll wanna check out my forum vwkd.com shameless plug
Glad you sorted your car, you should take it somewhere and get the battery checked out and check to see if there is any draw on the battery as It's strange it should dump Its charge for no reason.