in some ways in depends how long you want to wait – different scenario to yours but had to change from our XC40 as blind spot and other issues made it hard to drive and after much deliberation we ordered an VW ID3 – we are still waiting from August but there may be one in stock if your not too fussed about colour etc – moat
options on most model have what you are looking for i think and the AP is reasonable