Justin Whalin for sure!
I liked the writing for Jimmy in Season 1 - there's a wonderful character evolution that goes on. But I just couldn't get past the stiff acting. Justin Whalin seemed so natural and upbeat in the role. And heck - Justin is a whole heck of a lot cuter too!