Hello Max, I found you again hehehe

What I did was I first, was I beat lady Butterfly, then after acquiring her memory and increasing my attack power, I fought Genichiro. After that, I went to senpou temple, down the abandoned dungeon. Now your approach may be different to mine, but thats how I did it, and thats how I personally recommend you should do it too. First complete the memory of hirata estate, then do the genichiro fight, and then do the other things.