Regarding what #2 said about "just adding my two cents while i have...", I totally get the frustration with the X-T5 size. I remember my first big trip with a small mirrorless body and no grip—by day three, my hand was basically a permanent claw from the cramping. You are gonna be walking like 20k steps a day in Tokyo, so comfort is actually a safety thing so you dont drop the thing when you're tired. Since you are on a budget after that big purchase, skip the official Fuji stuff. I have tested a few alternatives over the years and these are the most solid:

• Meike MK-XT5-G Metal Hand Grip is my top pick. It is all metal, fits the X-T5 like a glove, and gives your pinky a place to live without adding much weight. It feels like part of the camera.
• JJC HG-XT5 Camera Hand Grip is usually even cheaper than the Meike. It has a decent texture that matches the body pretty well, though it feels just a tiny bit more hollow than the Meike one imo. On the battery front, I am honestly obsessed with the SmallRig NP-W235 USB-C Rechargeable Camera Battery. Since it has a built-in USB-C port, I just charge it with my phone cable in the hotel or off a power bank while I am grabbing ramen. It saves so much space because you dont need to pack a dedicated charger brick in your bag. Just grab one of those grips and a spare battery and you will be set. Tokyo is a dream for photography... just make sure you can actually hold the camera comfortably before you get on that plane!

Yeah the pinky dangle is real with fuji bodies lol. I was pretty annoyed until i picked up the SmallRig L-Shape Grip for FUJIFILM X-T5 4136. Honestly its a lifesaver for the ergonomics and way better value than the official fuji version. It has a built-in arca-swiss plate which is nice for tripods, and it only adds about 79g to the total weight. For the power issue, the 2200mah capacity sounds like plenty but the processor draws a ton in boost mode... basically you need spares. Since you spent your budget already, these work well:

• Wasabi Power Battery 2-Pack for Fujifilm NP-W235 2250mAh
• Nitecore FX3 Dual Slot USB Portable Charger for NP-W235 Im really satisfied with how these fixed my handling issues without breaking the bank. The nitecore charger is super slim too so it wont clutter your bag in tokyo.

just adding my two cents while i have a minute... i've been shooting with fuji for a decade and i'm honestly so satisfied with the xt5 but yeah the grip is tiny. i had the same pinky dangle problem and i found that a thumb grip actually solved it better for me than a bottom plate. i use the Lensmate Fujifilm X-T5 Folding Thumb Grip and it completely changes the ergonomics by giving your thumb a solid place to rest. it makes the whole camera feel balanced even with heavier lenses. quick tip: set your auto power off to 30 seconds and turn off pre-af in the settings to save a ton of battery life. as for the power stuff... i've had no complaints using a compact charger in my bag. the Nitecore FX3 Dual Slot USB QC Battery Charger for Fujifilm NP-W235 is great because it shows you the battery health and charging speed on a little screen. it's super helpful when you're on the move. also if you're worried about security in tokyo crowds i'd suggest the Peak Design Slide Lite Camera Strap SLL-BK-3. it's thin enough to not be annoying but the quick-adjust handles are a lifesaver when you need to pull the camera tight to your body. works well for me and doesn't break the bank like some of the official fuji gear... anyway enjoy the trip, you're gonna have a blast.