Personally I'd keep it original... but that's just me... I guess you have to do what's right for you. Personally, having an original MVS cab is far more desirable in my eyes...
Also, I guess the 6 button layout would probably be a bit odd as aren't most Neo cabs 4 buttons in a row... you could hardly have 6 in a row and sticking 2 underneath would be slightly awkward...