Enhanced flux pinning to high fields in YBCO and YBCOAG superconductors through preform optimization in infiltration and growth process