My other, other car is a B8 A4 Avant which developed oil consumption issues.
I decided to do an S4 swap & it should be done in 3 weeks.
3.0 S4 motor going in:
Engine swap completed. Interior, trans & suspension are next.
Since the wife daily drives the F36, I've had to daily drive a 3.2 TT.