It really depends on the answers to two questions:
1) How tight is your budget going to be if you have to make that $530 payment every month?
Obviously, you'd still be better off than you are now, since that's still $30 cheaper. But, if you're living essentially paycheck to paycheck, then the extra flexibility of the $400/month option can make the difference if something unforeseen happens.
2) How disciplined (financially) have you proven you can be?
The "I'll make extra payments every month" sounds real nice, but many people end up not doing it. I should know, I'm one of them. I'm still paying on my student loans because of it. If you know (by having done it before), that you can make that extra $130 go out each and every month and not talk yourself into using it on all sorts of "more important needs", then hey, go for it. Financial flexibility is a great thing, and having that monthly nut (all your minimum living expenses combined) as low as possible contributes greatly to that flexibility.
Update: Another thing to consider
Another thing to consider is what they do with your extra payment. Will they apply it to the principal, or will they treat it as a prepayment?
If they apply it to principal, it'll be just like if you had that shorter term. Your principal goes down additionally by that extra amount, and the next month, you owe another $400.
On the other hand, if they treat it as a prepayment, then that extra $130 will be applied to the next month's bill. Principal stays the same, and the next month you'll be billed $270.
There are two practical differences for you:
1) With prepayment, you'll pay slightly more interest over that 60 months paying it off. Because it's not amortized into the loan, the principal balance doesn't go down faster while the loan exists. And since interest is calculated on the remaining principal balance, end result is more interest than you otherwise would have paid. That sucks, but:
2) with the prepayment, consider that at the end of year 2, you'd have over 7 months of payments prepaid. So, if some emergency does come up, you don't have to send them any money at all for 7 months. There's that flexibility again. :-)
Honestly, while this is something you should find out about the loan, it's really still a wash. I haven't done the math, but with the interest rate, amount of the loan and time frame, I think the extra interest would be pretty minor.