I personnally went the mechanical keyboard way. It's fantastic and feels much better typing all day long.

I use a Vortex KBC Poker 3 with Cherry MX blue. Smoothest feel and most satisfying clicks all around. The 60% layout saves room on your desktop and you get used to combinations keys really fast (for arrows, functions keys, etc.)

Apple Magic Trackpad for the mouse. So much time gained with gestures and multitouch. Works like a charm on Windows and Linux too.