Searching for my Holy Trinity machine [~£1000]

I am after some advice on buying my next espresso machine. The holy trinity of features I'm looking for is: *Temperature Control, *Flow Control, *Fast Warm-up.

Now I am going to annoy you by saying that I would quite like to go E61 and do a flow control mod. In my head I think that something like a Quick Mill Pop Up would be the answer, but in my heart I like the "lifetime" build of some of the older machines, including E61's. My brother-in-law has done the Gaggiuino mod and I don't love the plastic/digital feel of it.

My espresso machine history over the last 20 years includes: cheap Woolworths machine, Solis Crema, Gaggia Classic (the gold one), Gaggia Cubika, Pontevecchio Lusso 2, and currently a DeLonghi Stilosa.

The Pontevecchio could have been my endgame machine (nice, tactile shots from a sprung lever, and had basic temp control via a pressurestat screw), but the heat-up time was really long. I like my Stilosa, but having tinkered with different baskets and screens, I still feel limited by the lack of temp control (for lighter roasts) and flow control (when the second half of a shot starts to run too fast).

Other info: I personally drink espresso 95% of the time (don't really need a dual boiler), but my daughter likes milk drinks. I've resorted to mainly medium roasts locally, or darker Italian beans, but I do enjoy light roasts in good cafes and would like to be equipped to enjoy them at home. I am a bit of a cheapskate and have had most of my machines used, and with DIY mods. I would kind of like this to be my final machine, or at least give me 5-10 years. I already have a good grinder (Macap MXD).