well if you are going to upgrade and you're not wanting to spend a lot[which is understandable, having bought the bike new so recently] I would recommend the Sugino xd. I have them and really love them.. and get a 107 bb. With the chainring on the inside, I have a near perfect chainline.

hope this helps a bit, sorry about your situation.