2-3 year timeframe for an investment in equities is too short and probably not worth the risk. Even 5 year is an absolute minimum, you need to be thinking up to 10 years at least IMO.
Stick to cash if your timeframe is 2-3 or 5 years.
But I would max pension contributions if you don't need the money.