welcome to the club :cheers:
if i were you id just run the 2.8 untill it dies then swap the 3.4 and by then if your more comfprtabe with swapping motors you could swap a 4.0. or you could just buy a 4.0 manche and leasve the 86 stock and modify the other one.