So if you had to change what would it be?

[MrPT]

M3 V8 or RS4 would get my vote.

You could get a ~50k RS4 Avant (B7) for your budget.

 

[jimmybell]

There's only one upgrade really, and it's a 991 GTS

 

[inkey$]

550i touring.