Brett, Pretty sure Christian is running one of hose Boyer setups, but he had it fitted while O/S. Maybe have a chat to him about it.
I wouldn't be too concerned about your current setup, though. I found out from Steptoe That he'd done an exact swap like yours into his current flood victim (516) a few years ago and it hadn't missed a beat in that time.
Maybe hang off till the rally, so you can see firsthand what everyone else is running?