Thanks. Yes, I did the filter too. It has now been 5 hours including 2 separate 30 minute drives, both with no oil light. I will check the dipstick again before my next 30 minute drive tonight.
You are right, I have put 6litres in so really the dipstick should be over the maximum indicator...