Usernamevisible, really good questions here. I prepped heavily on DS Focus Edition so let me share what actually worked.
On your first question: yes, classic GMAT DS is still worth doing, but with a filter. The older questions that are purely algebraic, like "is x positive?" with two pure inequality statements, don't show up much anymore. What you should be mining from older material is the word-problem DS, the ones with overlapping sets, rates, percents, ratios. Those translate almost perfectly to GMAT Focus Edition style.
Manhattan GMAT's DS questions in their Strategy Guides are solid for this.
On non-math DS: this is genuinely thin territory. There aren't many good non-official sources. What I did during my prep was use GMAT Official Guide question sets and the GMAT Focus Official Starter Kit, then filter specifically for DS questions tagged "statistics" or "logical reasoning" types. For non-math DS practice, the GMAT Club question bank actually has a category filter for Data Sufficiency with tags like "word problems" and "other." That's probably your best bet outside of official material.
One thing that helped me a lot: for each non-math DS question you attempt, practice writing out in one sentence exactly what information would be sufficient to answer it. GMAT Focus Edition DS rewards people who can articulate the sufficiency condition clearly before they evaluate the statements. That habit transfers to trickier logic-based questions.
Good luck with your prep.