And if you do go to the Embassy, report back what they say!
I am in a similar situation to you - I have an employer pension that I will be claiming is covered by the treaty, but I also might benefit from including the contributions in my present income (and using excess FTC to pay the tax due) so as to increase my basis in the pension. Would be interesting to know if the IRS folks view that as an option.