Yeah, a height adjustable desk which allows to switch between sitting and standing is the way to go.
There are a lot of great adjustable height desks available in a number of price points: http://officesnapshots.com/2012/08/24/7-adjustable-height-de...