Instead of modifying or soldering, are there any battery basket available to use NiMH. If it is too complicated I will use alkaline battery since I shoot seldom with flash.

But, I like photos with bounce flash esp., PanF+ or any slow speed film developed with Rodinal Stand.