Given how long you used your DS, I'd also vote for the k-3 (assuming a discontinued k5ii series isn't available near you for
significantly less than a k-3). But I'd be tempted to save up for your first choice in glass instead of the tamron 17-50 if you can be patient. You're looking at a multipurpose widish zoom that you'll probably use for several years or more, living a few months on ramen noodles or baguettes might be worth it
. If your DS wasn't in such rough sounding shape, I'd also suggest waiting for the k-3's replacement to be announced before picking up a k-3, but it might not be worth committing to using a frustrating body for an indeterminate amount of time.
You're absolutely right about the joy of use, I moved from a well worn k100d to a k5iis and the biggest difference to me has been how much nicer the various little features included in the 'higher end' bodies are to work with (plus having a camera with fully functioning buttons and dials is nice
). You're familiar enough with your DS to know if these little doodads are worth it.