Sorry, I haven't looked at the site for a while and just seen your post. I will certainly look at HSA, though if I stay in my present job for another four and a half years I will be entitled to PPP, so I might hang on and wait!
Thanks and best wishes