It's looking good Andy.
The upper wing roundels would definitely be Type C1 (yellow outer ring) in May 1945. They changed from Type B, Blue/Red, early in 1945.
I can't remember the exact date without looking it up, but from memory the change was ordered to be in effect from January 14th.
The yellow outer ring was omitted, making Type C roundels, much later, and again I'd have to check dates, as RAF Germany and RAF ADGB changed at different times - very late 1945 and early 1946 if my memory is correct.