I would second the Nova. I have one and had a MSR Whisperlite International way back when too. The Nova does not need to change jets, so less parts to potentially loose. IMHO the Nova pump is a higher quality, more durable pump too.
I have burned diesel, kerosene, and white gas in the Nova. The only thing I noticed is when changing between fuel the first time you get a minute or so of sputtering before the flame settles in.
Yes it is a little heavier, but for the versatility, stability and ease of maintenance I would make that choice again.