The OEM rack looks like it was intended somewhat as a sales gimmick, rather than an actual functioning rack. I'd replace it with even a cheap Al std rack.

I'd add bar-ends too, for more hand positions.