What Rating is the MCB? you say 40Amp , but what letter?
I had a Faulty MCB, it had prev had wired into it the shower and the Fan for the shower, and would get hot when shower was in use, eventualy causing same problem as you seem to have.... I purchased a New MCB 40Amp rated B and replaced it, shower works damn fine now..... and its a Mira.....
Disconnect Mains.... check conections from shower to switch, switch to the CU, replace MCB, Reconect Mains and test..... Could be as simple as a fualty MCB.... Defo wouldnt go putting a 50Amp MCB on their, just it case it causes other probs.