Ordered a replacement fuel pump and looked at the fuel pump control module. Rode the bike and it was cutting out like crazy. Long story short the kick stand is causing the engine to die. This is a seperate problem from the fuel sytem that was cutting out. May be fine after filling up and Techtron added.
Now on to the kick stand issue..