What you need on your controls seems to be fairly simple and straightforward.
But without pics , really hard to help.
Had you posted clear pics in the beginning, we could have helped you thru quickly.
While finding a solution is the main goal, finding an elegant solution, that fits in nicely and compliments the bike.....is even better..