Hopefully my LBS will finally be able to get my hub redone with a new rim & spokes this week, but in the meantime I've been riding it as normal. Here's what it looks like now. The wobble looks bad, but I really don't feel it.
Shop suggested Velocity Cliffhanger rims & 13/14 butted spokes, but...