Yeah, if you're going to the trouble of putting quality parts in that thing, why not make your own panel and fix the button layout while you're at it?
...and yes, the X-arcade will be easier to sell in one piece. Otherwise you'll end up with a pile of extra parts you can't get rid of.