Try to stretch a bit and get something a wee bit higher than the justice. Like the Crysis for example. It is a really good bike for your money.
If not, then don't change brands. In terms of complete bikes, WTP completes are usually at the highest spot in terms of durability and have no issues whereas another bike of the same price could have a bad stem, low quality bolts that strip too easily, or bad painting (rust will show in one year or so, the paint is there to make it nice when you see it in the showroom).
Get the Crysis and you will be the happiest guy in the world.
Worked out for me 
It doesn't matter where a train goes. It's decidin' to get on that does.