I saw that NiteHawk at Nashbar and thought it looked like a nice light at a price that is hard to beat. Your plan to replace the bulb and battery sounds good, but you might be happy with it just the way it is. If you do replace the bulb and battery you will need to get a 12V bulb. All of those lights I have looked at use standard MR11 type bulbs so you can get them anywhere like Lowe's, Home Depot, the corner hardware store, etc., thought sometimes it may be hard to find lower than 20W since these places are selling them for use in home halogen lighting and garden lights. You can order them from places like lightbulbsdirect.com and many other online sources.