Should I consolidate a student loan with a mortgage?

My mortgage (on a condo I used to live in) is coming up for renewal this summer.

At the time of renewal, I'll owe $208k on the mortgage. 5 years in based on a 25 year amortization.

I currently owe $65k on my student loan, but expect that I could have that down to $40-45k (possibly less) by the time of my mortgage renewal. (At prime plus .5%: 3.2%).

I had considered consolidating the two loans previously, but had sort of ruled it out as I figured having them stay separate would motivate me to pay it off a bit sooner. (That, and I expect to have it paid off within a year, so the interest saved won't be that much).

The financial advisor at my bank suggested it again, and reminded me that if I were to consolidate, all of the interest I would pay on the mortgage would be tax deductible (whereas I can't claim the interest on the line of credit). She also suggested keeping the amortization at 25 years again, but I'd rather have it at 20. (Monthly payment difference of ~$240 assuming 2.69% rate).

Thoughts?