Well, I was always from the school of thought that if you're going to upgrade... wait... see what the best item is you can get, or get in the near future and go for it.
So, my limited knowledge answer is, go for an HID light. You're making a mild jump by going to this CFL, and it will help...