IF you have to change the board, I would recommend a Virtue Redefined.
It's more reactive than the stock one, and not much more expensive.
OLED are great, but do you really use the screen that much Sid ?
And I don't like any other grips than the stock one.