My starting point on any of these is to review your taxes, see if there is any return you can do for previous years and check that you are set up in the most optimal fashion going forward. Given you are a free lancer, it might be worth an hours conversation with a professional Tax advisor, especially if you up your pension contributions
Have you checked to see what state pension you will be entitled to when the time comes?
Not sure what you mean by "Pension Currently Paid Up: approx €40K" is it 40k in your pension fund? That sounds very light and would suggest you only paid into it for a handful of years. Is that correct?
You need to turn this a little on it's head and try and figure out what you need to survive comfortably on in retirement and then start figuring out how to get there
Also, as a single person, is downsizing an option?