Which model has better build quality?

I'm looking to buy another PS Vita after having to sell my old 2000 for financial reasons. I remember my 2000 having noticeable creaking sounds from the casing to the buttons creaking when pressed.

Is the 1000 any better? My main concern is in button quality. I know the PS button on the 1000 is worse than the 2000 but I really only care about the d-pad and face buttons.

Which do you think has better quality?