Nice! Sounds like you're all set up. I commuted for many years on a bike donated by one of my family members and I was pretty lucky - only spent $30/year for tune-ups, plus buying a helmet and lock. It was terrifically ugly and nobody touched it for five years on my theft-prone campus (my cousins lost 3 bikes in the same time period.)

Getting an older model (if that's what you did) from the LBS is a great strategy - often they're marked down pretty aggressively, and there's no reason to have the absolute latest model.