While in the military I got lucky and had a higher ranked individual tell me on day one to open a TSP account and start contributing right away without any hesitation. Luckily I listened even though at the time I wasn't quite sure why I was trusting him. That single piece of advice allowed me to be on track for retirement for someone my age when none of my friends are.

I too am anticipating the bubble popping in coming years so I'm trying to figure out the best strategies moving forward. One I have mentioned before is not investing in any Real Estate until a dip occurs. The next thing I have been considering is what you mentioned about moving stock funds. With that TSP account I have a safe little haven called the "G" fund that I plan to use to shelter from the storm.