Simplifying, I understand...because I've thought all along that you were using a lot more funds than necessary; but what's your motive on these taxable and tax-advantaged changes?
Sorry I didn't get back to you sooner on this...but here is what I meant. Folks sometimes want to include some real estate investments in their portfolio but unless you're really wanting to be overweight in real estate, most of us have plenty of real estate included when we consider what we've got invested in our homes. Secondly, when you’re trying to determine how to diversify between more risky (stock) or less risky (bond) investments; most of us will err on the side of being too conservative because we don't include the NPV (Net Present Value) of the (pretty much) guaranteed income from our CSRS retirement. You see, that CSRS pension is pretty much the same as having a few hundred thousand dollars invested in government bonds. See?
I always suggest that you put a percentage equal to your age (about 63%) into safe stuff and venture the remaining percentage into something a little more risky to help keep your return high enough to offset inflation.
One more thing (while I've got your attention and I don't know what else to do with it), you've got to get a return that exceeds economic growth, including inflation or the money you are trying to accumulate looses purchasing power. To do that you have to remember (1) World-wide GDP must increase at about 1-1.25% to grow as fast as the population increases, (2) U.S. GDP must increase at about 2.5-3.5% to keep up with our national population growth and (3) inflation is any increase in either or both GDPs above population growth. The reason I say this is that GDP is basically a measure of money supply...it must increase at the same basic rate as population to ensure that old supply/demand curve doesn't drive inflation or deflation based on the amount of money available per person. Bottom-line...after-tax return should exceed 4.75% just to break even and keep the same purchasing power. Otherwise, you'll get more bang for your buck if you just spend your damned money now!!!

"There are three kinds of men. The one that learns by reading, The few who learn by observation, the rest of them have to pee on the electric fence for themselves."
[Will Rogers]