I think it depends on your tax bracket now and what bracket in which you will be retiring. Thus, if you are in the 25% or higher marginal tax bracket now, but you plan to retire in the 10-15% bracket, then, IMO, the tax deferred accounts win, as you are transporting money from employment to a lower bracket (retirement). If you retire in the same bracket as you are in presently, then, IMO, a Roth is sweeter, as you have more flexibility in withdrawals.
Also, consider losing the financial adviser and go free style, if possible. The typical adviser's job is to convert your account to his; they do not generally have a fiduciary interest ethos.