I don't know if album reconstructions constitute an ethical line that you won't cross, since by nature they are almost always sourced from officially released material, and I don't think I've yet brought this to your attention (though apologies if I've brought this up before), but I've been listening to it for almost three years and think that you might at least find some interest in it.

It departs from your ideal tracklisting in a few places - there's no "Water" or "My Wife", nor "Join Together", "Relay", or "Long Live Rock". There are multiple reasons for this explained in the blog post itself, some of which may be based on incorrect facts (the reconstructor, soniclovenoise, claims there's no direct evidence that "Join Together" or "Relay" were meant for Lifehouse), but the primary gimmick that informs this reconstruction (and soniclovenoise's work in general) is a fidelity to what the album may have looked like if it were a double LP released in 1971. However, it resequences the album more logically than the track listing of the 1971 version as Townshend made it, back in 2000 when he released his contemporaneous demos for the Lifehouse Chronicles box set.

But there's a lot to recommend this effort. Three of Townshend's demos are used in place of nonexistent/nonsurviving/unreleased Who versions, but they're fully realized - "Teenage Wasteland" is a good, brooding opener, and "Mary" and "Greyhound Girl" are fantastic. There's a really nice stereo mix of "Time is Passing" (the right channel comes from a high-quality bootleg of studio material), and given your problems with the initially released version of "Love Ain't For Keeping", I think you should hear this hybrid of the Who's Next and Odds & Sods versions. "Baby Don't You Do It" is here too, and it serves a clever diagetic purpose; ending Side A, it's the song that the protagonists hear from the pirate radio broadcast by Bobby (yup, the subject of "Behind Blue Eyes"), and from there the narrative really takes off with "Baba O'Riley".

I'm not sure I'd call this definitive (the absence of "Water" does give me some pause, but I guess I wouldn't be satisfied unless the entire Isle of Wight recording was dropped in, and besides whatever legal issues that would've entailed at the time, it would totally wreck the double-LP concept) but it's sure worth hearing if you're willing.
https://albumsthatneverwere.blogspot.com/2016/09/the-who-lifehouse-upgrade.html