I would go the TQ route .....with a 904 trans.

FI still is a PITA, expensive and does not work right all the time.