No swap, sorry, mine fits perfect [17"] and was a NOS frame and fork.
The P2 fork is a bit long, you need a 390 -395 mm axle to crown fork.
Don't know where you can get an original but there are loads of forks that would do the job and have the look of the original come up on ebay
I think geometry was 71 head /73 seat [degrees] quite steep and sharp but even with long low stem feel planted even on steep technical stuff.
I think there has been a mod' to your frame... the seat-clamp on mine is integrated but had a reputation for slipping - looks like your has a separate seat collar.
Hope this info helps...?
cheers matey, well if you're ever feeling a bit taller you know where to come
how does it ride? I've only ever ridden steel so far..
the cable routing is a little different too, I did read somewhere about the slipping post so maybe RSP absorbed the critisms and did a little fiddling for the later frames??