I don't think LN is the solution. It brings in more complexity which is counterproductive to security
Luckily you do not need to use LN and can continue to use "standard" Bitcoin (which is why the SegWit changes are a "soft fork").
Also the changes that have been made for LN support are really not very complicated at all (and have been thoroughly tested for many months now).