Sounds like a plan to me. I think that there is really no point in measuring your wealth in USD anymore though, because who knows where USD is going to crash to by 2020.

Still, always good to invest & save. Better than letting your money lie around and do nothing.