Luckily some members of another forum I'm on have a brain which is better than mine.
Since my UJ at the bottom is essentially straight, I could used on of these at the top to sort the issue.
https://www.summitracing.com/parts/brg-133449
The double UJ will fix the velocity mismatch at the top and should make for far nicer steering feel.