Optimise the ESSvSB+ horn design and its pulse generator