I like many others had this same problem, I replaced the bypass valve & it didn't make any difference

Try doing as vwsystems suggested, flush & reverse flush the matrix & see whether that improves the heat, I did this after replacing the bypass valve & it did improve things slightly!
I think I may have a blocked matrix (possibly some kind of rad weld type stuff

but I'm going to leave it until the weather improves).