The new Hero Xpulse 210 is a good choice as it makes for a very comfortable city commuter as well. You might find the seat height a little tall, so we'd suggest that you take a test ride before making a decision. If that's the case, you could consider other motorcycles like the TVS Apache RTR 160 or 200 or the new Yamaha XSR 155 as good upgrades

Considering your long daily commuting distance, we will keep comfort and fuel economy as the highest priorities. Since you haven't specified whether you want to stay in the same performance spectrum or not, we'll give you options from both sectors. 

The Hero Xpulse 210 will give you great comfort and fuel economy while giving you similiar sort of performance as your TVS Apache RTR 200 and is well within your budget. 

If you want something a little more retro, you could take a look at the Royal Enfield Bullet / Classic 350 models, as both have a comfortable ride and will deliver decent fuel economy if ridden sensibly. In a similar vein, the Honda CB350 trio can also be considered for the same reason. 

Last but not least, you could also opt for the TVS Apache RTX 300, which will give you the most performance and a very spacious and comfortable riding position. Given its displacement, you should see decent fuel efficiency if ridden sensibly, although we haven't been able to test it for ourselves just yet. 

We recommend a thorough test ride of all the options you shortlist before you decide to put your money down. 

Since you haven't specified your budget, we'll give you some options from both the same segment as well as one above. 

In a similar displacement and performance range as the FZ25, the Bajaj Pulsar N250 and TVS Apache RTR 200 4V are good options, and the Pulsar in particular has a great headlight spread. You should also look at the KTM 250 Adventure because it has more performance than your FZ, good highway manners and a bright headlight too. 

If you are open to stepping up to a 300cc machine, the TVS Apache RTX 300 will be a great option. It has even more performance than the aforementioned KTM. Moreover, its Top and BTO variants come with a very bright LED headlight that also has good spread and throw.

We recommend exhaustive test rides and seeing the headlight performance of each of the bikes you shortlist for yourself before going ahead with the purchase.