I would go with the avistar. You probably still have the engine and electronics from your P-51?
The avistar is a bit more aerobatic than most trainers and not as squirrelly as the P-51 (I am no fan of the PTS P-51 either)
If you still have an instructor to buddy box with you it won't hurt for the first flight or two of a new airplane.
Best of luck