I have a 96 XJ Right Hand Drive, have had the Jeep for 8 years

Problem started as very intermittent once or twice a year and I could not determine what was causing it, but recently fault is nearly solid so at least I now have something to fix.

All works fine right and left turn lamps and warning flash are all OK. NORMALLY

If I switch to main beam or flash head lamps right hand front, side and dash board lamp come on solid Not rear right lamp. These stay on even with engine off.
If I move the turn switch to indicate right the rear lamp comes on solid as well.
Hazard warning switch will light left hand lights as normal and leave right lamps on solid. Turn switch to indicate turn left and all left hand lamps are flashing as normal. (right hand lamps still solid on)

I am thinking first to change the Turn relay, then check for bad earth or bulb seating problem and last resort the switch assembly.

Although Jeep is 96 build it has the newer single square relay installed anda non standard fuse panel, but that could be because of it being RHD?

Any other thoughts would be appreciated, just to add I now live in Spain and the general feeling is that a RHD jeep must have come from Mars