was about to just say the Dell XPS - they have a 30% off sale at the moment. I got the XPS 15 a few months ago and love it. I've always used keyboards with a 2 row Enter key and I was thinking I would have a problem with this one, but I found I got used to it pretty quickly (although having the same type of keyboard on all the computers at work meant I had to)
not sure why you'd want the backslash on the left - thats just weird
otherwise the laptop itself is really well built with real metal case (although that adds to the weight of it) and the JBL speakers in it are nothing short of brilliant. Keyboard itself is fantastic to type on and the trackpad is huge (about the same size as the Apply Macbook ones) and it came with Windows 7 Ultimate 64bit (so can use all of the 8GB of RAM)
Hope you can get the keyboard issue sorted.