For best overall quality and used primarily for general purpose and landscape.

I don't have any more camera budget, and I'm actually hoping to get money back from selling gear. I also have the 50 1.8 that I won't sell, so please keep that in mind if suggesting other options. Returning the t4i and 18-135 would let me gain back $550.

Camera:
30D bought new in 2008
refurbished t4i bought to replace 30D

Lens:
17-40L bought new in 2008
refurb 18-135 STM with refurb t4i
or selling both and purchasing 15-85 (likely used/refurb)
other options in the same price range?

So what would you choose to do?