I think it really depends on your perspective. If you have plan to move or sell the house in about 2-3 year time frame, I would go with the two year rate. If you think the economy will improve soon with the likelihood of rate hike and you do not have plan to sell or relocate, than choose the one makes you feel comfortable.