There's nothing wrong with the comfort levels in a Mk2, so long as you get one with seats in good condition.
I've had both a Mk2 16v and a Mk3 16v, and I would say that if you want creature comforts and a more modern feel, go for the Mk3, and the 16v is a good car performance wise, but the Mk3 16v is prone to more electrical problems than the Mk2.
The Mk2 is definately more of a drivers car and 16v engine is great (though it likes the chance to get out on the open road), and if your suspension isn't too hard and the seats are in good condition, then it shouldn't be any less comfortable than a Mk3.
Plus you can get a Mk2 with most of the electric gadgets like the Mk3, like PAS, electric windows, mirrors, Central locking etc.
2k would get a stonking Mk2 16v, but also if you look properly, you can find a decent Mk3 16v.