Your outline for Swami's seems like a good plan for the improvement of the article. If you need more ideas, I already put down two questions for you all on the talk page of Swami's. I look forward to those contributions you plan to add in :)