staying in brand the new vectis is due out mid june, £1800 new, theres the argos,but i believe thats in batches. The compressa is same size as the l1, as is an lr24
if you do move away from a lever, which is very hard to do, then id suggest the lelit bianca £1800 as its a great dual boiler, if you wish to spend less then there are a couple machines £1200 range marax or elizabeth or tiny is the puristika from ecm, but you will loose the steaming function with that.
grinder wise, if you want to go smaller, theres the new niche duo, or you may get away with a zero same size vurrs as your current grinder, failing that look at the new df64 range theres a cheap solo on bella barista atm