I think that in a borderline case like this, the math department is indeed the better choice.
At least according to my experience, the math community seems to be more flexible, give you a nicer environment and more freedom on what to work on. Also, it's a bit less competitive and the job options are better.
Read also the excellent advice of John Baez, http://math.ucr.edu/home/baez/advice.html .
