Russell - Your original questions and the answers here are pretty detailed and thoughtful, but I think you're at the stage now where you are going to have to look for a fee-based financial planner. I have the sneaking suspicion that I both know too much and not enough about your financial situation.
I especially think that several of your moves are chasing returns and causing churn. For example, moving roth money into energy right now might prove to be okay, but my gut feeling is that the profits in that EFT have been factored in already.