You most definitely do need some new wheels because every bike you own should have some “best” wheels, and some “training” wheels. The best wheels are for using all the time whatever the ride/race/conditions, while the training wheels should be stuck against a wall to brood.
Having just gone through this process for my 901 Im a convert to the wide internal diameter for bigger volume and lower pressures without burping air every time you hit a root school of thought. Ive got 30mm internal diameter DT Swiss XM481’s on Hope Pro4’s, which Swinnerton Cycles built up and delivered for £400. Loving them so far.