I think he tolerates Temari more. Then again, Ino is his childhood friend and he considers Temari scarier than his mother. XD He's gonna be so whipped...
I think Shikamaru is in love with Temari (though he probably wont admit it), but he is closer to Ino. Just in a different way. They are close friends. I think (or I certainly hope) Ino and Choji will get together. :D