I don't know if Mister Felps would agree with me, but I recommend strengthening your data structure. I cannot begin to tell you how much code I've seen written to compensate for a bad data structure.

Once it has been in use for a few months, a bad data structure can evolve into something really nasty. Kind of like that take-out somebody left in the office fridge -- trying to clean it up just makes you gag...