ouch......ouch..... ouch.....
all the time spent on shifting ,,, wasted because the bike frame was never securely assembled ??
I am sorry ,, but you NEED a bottom bracket with a flat surface like they all used to have or a 2018 front end parts that no longer clamps in that manner.