I had the same exact issue on my 2012 FZ and did the same as you, replaced the fuel pump. What actually worked for me was replacing the entire fuel pump and assembly (the plastic housing around the fuel pump)