Azteca

Guys,in a nutshell,here's the problem,changed what I thought was a bad sending unit,got it from the f store,same problem,bad readings,etc.requested a new one,got it ,put it in,same problem,now i was told,check the baffle,if its broken,this is what happens,sure enough,i looked inside,cracked plstic,and I guess the design is to have the baffle ride the fill and vent tube.Well, I couldn"t get the whole baffle out,so I just jammed it forward,re-installed,worked for an hour,now it sounds like crap!Any correct fixes for this,or do I need to find another tank,hopefully with a good baffle,which at this point,is getting impossible to find.And why did they make a slidng baffle? Not a great idea from any point of view.thanks for any input!