That does look factory and compliments the design.
I have no doubt I won't be able to restore the original, however it is a wide low design which will mean some modifications. Something that at some point I'll give thought to. Unfortunately my layout looks somewhat more cramped than yours.