@nxcess If you're not using full 20k ISA allowance then do that but put some into a cash ISA for quicker access if needed and rest into s&s.
It is scary you don't have much pension saved but if you have a plan to buy a property in next few years then focus on that first...