Wes C:  I don't believe the US Army or National Guard cared about bayonet dates matching production date of rifle.  That's a collector quirk.  Your 1898 dated bayonet with the 'smooth' rivets should also have smooth grips and is correct.  Your 1898 dated bayonet with the 'raised' rivets should have machining marks on the wood grips and is also correct and probably arsenal rebuilt.  I believe the change to raised rivets was approved in 1899.