Double clutch....God I can't believe I just said that but...I just got my car no more than a month ago and it does have the same problem with third gear and if you do double clutch it might be extra work but it is going to be easier on the syncros.
Might help a bit
http://www.g2ic.com/tegtips/driving/2.html