The Japanese adapter will do just fine.  Its rated for 100V ac instead of 110/115 but they seem to do just fine.  I've never had any trouble with using them.  Some guys recommend using a stepdown to drop the 110 to 100, but really the supply can tolerate the higher voltage no problem.