I've gotten new spoke wheels with the sealed bearings in them, they are nice and fit perfectly. They take a 12mm axle though so you need to modify your stock forks to make the axle fit. Takes 2 min with a file. But that treats front disc combo is probably the easiest option