and I understand that I'd have to do a full skills test
The "full skill test" is actually exactly the same as a "proficiency check" Departure; 2 stalls; 2 steep turns, PFL; UP; arrival; 3 circuits; EFATO and a bit of Nav at the examiners discretion, about an hour.
If the examiner is dual qualified then you can combine them. Try Rob Spencer at Bonus.