Call or email: http://carpenterracing.com/sbp_bonneville.htm for a EFI Tune Quote, they can get your bike to be the best it can be, with the Mods you mentioned. They aren't that far away from you.