ya, like people have said, having a rim trued right will make it stronger and less likely to keep warping.

But if you want that new rim, H+Son is soon to release a 43.3mm deep rim (f**k you velocity) that is 22mm wide, which would nicely fit a 25mm tire up front, which would also help absorb some curb jumping shock. I doubt it will have a braking surface though.